diff options
| author | thompsa <thompsa@FreeBSD.org> | 2005-12-17 06:33:51 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2005-12-17 06:33:51 +0000 |
| commit | 3da0e4ba1fe984e45960cc020f02c1812058663e (patch) | |
| tree | 616d9689f1e07b9000b0750d870033bc002b1f9e /sys/net/if_ethersubr.c | |
| parent | 4c2aff868199d97ff84b3425e788fda6b28260ad (diff) | |
| download | FreeBSD-src-3da0e4ba1fe984e45960cc020f02c1812058663e.zip FreeBSD-src-3da0e4ba1fe984e45960cc020f02c1812058663e.tar.gz | |
Change from a callback in if_ethersubr to using EVENTHANDLER in order to detach
span ports when they disappear. The span port does not have a pointer to the
softc so revert r1.31 and bring back the softc linked-list.
MFC after: 2 weeks
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index f7f1e84..2d89cee 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -111,7 +111,6 @@ struct mbuf *(*bridge_input_p)(struct ifnet *, struct mbuf *); int (*bridge_output_p)(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); void (*bridge_dn_p)(struct mbuf *, struct ifnet *); -void (*bridge_detach_p)(struct ifnet *ifp); static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -899,12 +898,6 @@ ether_ifdetach(struct ifnet *ifp) (*ng_ether_detach_p)(ifp); } - if (ifp->if_bridge) { - KASSERT(bridge_detach_p != NULL, - ("bridge_detach_p is NULL")); - (*bridge_detach_p)(ifp); - } - bpfdetach(ifp); if_detach(ifp); } |
