d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The if_tap interface is of IFT_ETHERNET type, but it

Browse Source 
does not set or update the if_link_state variable.
As such RT_LINK_IS_UP() fails for the if_tap interface.

Also, the RT_LINK_IS_UP() needs to bypass all loopback
interfaces because loopback interfaces are considered
up logically as long as the system is running.

This patch fixes the above issues by setting and updating
the if_link_state variable when the tap interface is
opened or closed respectively. Similary approach is
already done in the if_tun device.

MFC after:	3 days
This commit is contained in:
Qing Li 2010-03-11 17:56:46 +00:00
parent 1b0181df2f
commit 355ad3ead4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/if_tap.c
View File

@ -502,6 +502,7 @@ tapopen(struct cdev *dev, int flag, int mode, struct thread *td)
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
if (tapuponopen)
ifp->if_flags |= IFF_UP;
if_link_state_change(ifp, LINK_STATE_UP);
splx(s);
TAPDEBUG("%s is open. minor = %#x\n", ifp->if_xname, dev2unit(dev));
@ -547,6 +548,7 @@ tapclose(struct cdev *dev, int foo, int bar, struct thread *td)
} else
mtx_unlock(&tp->tap_mtx);
if_link_state_change(ifp, LINK_STATE_DOWN);
funsetown(&tp->tap_sigio);
selwakeuppri(&tp->tap_rsel, PZERO+1);
KNOTE_UNLOCKED(&tp->tap_rsel.si_note, 0);

4
sys/net/route.h
View File

@ -319,7 +319,9 @@ struct rt_addrinfo {
#ifdef _KERNEL
#define RT_LINK_IS_UP(ifp) ((ifp)->if_link_state == LINK_STATE_UP)
#define RT_LINK_IS_UP(ifp) (((ifp)->if_flags & \
(IFF_LOOPBACK | IFF_POINTOPOINT)) \
|| (ifp)->if_link_state == LINK_STATE_UP)
#define RT_LOCK_INIT(_rt) \
mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK)