mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Add VIMAGE support to if_tap.

Browse Source 
PR:		kern/152047, kern/158686
Submitted by:	Daan Vreeken <pa4dan Bliksem.VEHosting.nl>
MFC after:	1 week
This commit is contained in:
Mikolaj Golub 2012-06-07 19:46:46 +00:00
parent a9f5e42532
commit fef68bb8dc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236724
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/if_tap.c
View File

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