diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-09-10 15:27:01 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-09-10 15:27:01 +0000 |
| commit | cd0854d65c28c0dbd64fb7112b7bbb4c165779a4 (patch) | |
| tree | 3e284f66da0dcb8717afd231103b7adf8cab40f4 /sys/net | |
| parent | 6f7f3237c9785caeb03618907dc509bc29dcd5a4 (diff) | |
Even the driver that should not be named needs if_put() after if_get().
ok claudio@, dlg@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_bridge.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 770cf32fe4d..2937b027c28 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.262 2015/09/10 13:32:19 dlg Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.263 2015/09/10 15:27:00 mpi Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -115,7 +115,7 @@ void bridgeattach(int); int bridge_ioctl(struct ifnet *, u_long, caddr_t); void bridge_start(struct ifnet *); -void bridge_process(struct mbuf *); +void bridge_process(struct ifnet *, struct mbuf *); void bridgeintr_frame(struct bridge_softc *, struct ifnet *, struct mbuf *); void bridge_broadcast(struct bridge_softc *, struct ifnet *, struct ether_header *, struct mbuf *); @@ -1082,13 +1082,24 @@ bridgeintr(void) { struct mbuf_list ml; struct mbuf *m; + struct ifnet *ifp; niq_delist(&bridgeintrq, &ml); if (ml_empty(&ml)) return; - while ((m = ml_dequeue(&ml)) != NULL) - bridge_process(m); + while ((m = ml_dequeue(&ml)) != NULL) { + + ifp = if_get(m->m_pkthdr.ph_ifidx); + if (ifp == NULL) { + m_freem(m); + continue; + } + + bridge_process(ifp, m); + + if_put(ifp); + } } /* @@ -1265,23 +1276,16 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } void -bridge_process(struct mbuf *m) +bridge_process(struct ifnet *ifp, struct mbuf *m) { struct bridge_softc *sc; struct bridge_iflist *ifl; struct bridge_iflist *srcifl; struct ether_header *eh; - struct ifnet *ifp; struct arpcom *ac; struct mbuf_list ml = MBUF_LIST_INITIALIZER(); struct mbuf *mc; - ifp = if_get(m->m_pkthdr.ph_ifidx); - if (ifp == NULL) { - m_freem(m); - return; - } - ifl = (struct bridge_iflist *)ifp->if_bridgeport; if (ifl == NULL) goto reenqueue; |