svn commit: r231201 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Wed Feb  8 13:39:38 2012
New Revision: 231201
URL: http://svn.freebsd.org/changeset/base/231201

Log:
  Set vnet context in callouts and taskqueues.
  
  PR:           164696

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c  Wed Feb  8 12:53:14 2012        (r231200)
+++ head/sys/netinet/ip_carp.c  Wed Feb  8 13:39:38 2012        (r231201)
@@ -707,19 +707,24 @@ carp_send_ad_all(void *ctx __unused, int
        LIST_FOREACH(sc, &carp_list, sc_next)
                if (sc->sc_state == MASTER) {
                        CARP_LOCK(sc);
+                       CURVNET_SET(sc->sc_carpdev->if_vnet);
                        carp_send_ad_locked(sc);
+                       CURVNET_RESTORE();
                        CARP_UNLOCK(sc);
                }
        mtx_unlock(&carp_mtx);
 }
 
+/* Send a periodic advertisement, executed in callout context. */
 static void
 carp_send_ad(void *v)
 {
        struct carp_softc *sc = v;
 
        CARP_LOCK_ASSERT(sc);
+       CURVNET_SET(sc->sc_carpdev->if_vnet);
        carp_send_ad_locked(sc);
+       CURVNET_RESTORE();
        CARP_UNLOCK(sc);
 }
 
@@ -1090,6 +1095,7 @@ carp_forus(struct ifnet *ifp, u_char *dh
        return (0);
 }
 
+/* Master down timeout event, executed in callout context. */
 static void
 carp_master_down(void *v)
 {
@@ -1097,12 +1103,14 @@ carp_master_down(void *v)
 
        CARP_LOCK_ASSERT(sc);
 
+       CURVNET_SET(sc->sc_carpdev->if_vnet);
        if (sc->sc_state == BACKUP) {
                CARP_LOG("VHID %u@%s: BACKUP -> MASTER (master down)\n",
                    sc->sc_vhid,
                    sc->sc_carpdev->if_xname);
                carp_master_down_locked(sc);
        }
+       CURVNET_RESTORE();
 
        CARP_UNLOCK(sc);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"