svn commit: r236724 - head/sys/net

[Mikolaj Golub]

Author: trociny
Date: Thu Jun  7 19:46:46 2012
New Revision: 236724
URL: http://svn.freebsd.org/changeset/base/236724

Log:
  Add VIMAGE support to if_tap.
  
  PR:           kern/152047, kern/158686
  Submitted by: Daan Vreeken <pa4dan Bliksem.VEHosting.nl>
  MFC after:    1 week

Modified:
  head/sys/net/if_tap.c

Modified: head/sys/net/if_tap.c
==============================================================================
--- head/sys/net/if_tap.c       Thu Jun  7 19:19:12 2012        (r236723)
+++ head/sys/net/if_tap.c       Thu Jun  7 19:46:46 2012        (r236724)
@@ -42,6 +42,7 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
+#include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -66,6 +67,7 @@
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 
 #include <netinet/in.h>
 
@@ -214,6 +216,7 @@ tap_destroy(struct tap_softc *tp)
        KASSERT(!(tp->tap_flags & TAP_OPEN),
                ("%s flags is out of sync", ifp->if_xname));
 
+       CURVNET_SET(ifp->if_vnet);
        seldrain(&tp->tap_rsel);
        knlist_destroy(&tp->tap_rsel.si_note);
        destroy_dev(tp->tap_dev);
@@ -222,6 +225,7 @@ tap_destroy(struct tap_softc *tp)
 
        mtx_destroy(&tp->tap_mtx);
        free(tp, M_TAP);
+       CURVNET_RESTORE();
 }
 
 static void
@@ -363,6 +367,7 @@ tapclone(void *arg, struct ucred *cred, 
        if (unit == -1)
                append_unit = 1;
 
+       CURVNET_SET(CRED_TO_VNET(cred));
        /* find any existing device, or allocate new unit number */
        i = clone_create(&tapclones, &tap_cdevsw, &unit, dev, extra);
        if (i) {
@@ -381,6 +386,7 @@ tapclone(void *arg, struct ucred *cred, 
        }
 
        if_clone_create(name, namelen, NULL);
+       CURVNET_RESTORE();
 } /* tapclone */
 
 
@@ -521,6 +527,7 @@ tapclose(struct cdev *dev, int foo, int 
 
        /* junk all pending output */
        mtx_lock(&tp->tap_mtx);
+       CURVNET_SET(ifp->if_vnet);
        IF_DRAIN(&ifp->if_snd);
 
        /*
@@ -544,6 +551,8 @@ tapclose(struct cdev *dev, int foo, int 
        }
 
        if_link_state_change(ifp, LINK_STATE_DOWN);
+       CURVNET_RESTORE();
+
        funsetown(&tp->tap_sigio);
        selwakeuppri(&tp->tap_rsel, PZERO+1);
        KNOTE_LOCKED(&tp->tap_rsel.si_note, 0);
@@ -945,7 +954,9 @@ tapwrite(struct cdev *dev, struct uio *u
        }
 
        /* Pass packet up to parent. */
+       CURVNET_SET(ifp->if_vnet);
        (*ifp->if_input)(ifp, m);
+       CURVNET_RESTORE();
        ifp->if_ipackets ++; /* ibytes are counted in parent */
 
        return (0);
_______________________________________________
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"