diff options
| author | glebius <glebius@FreeBSD.org> | 2012-09-26 20:09:48 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2012-09-26 20:09:48 +0000 |
| commit | 99ed11b97d20806dd7a7c8ef3162cf72cc36dd75 (patch) | |
| tree | 5f6ec501170cfc15136a0b749795a43f208d9b40 /sys/net/if_bridge.c | |
| parent | 0d4a7769ee242da1cfca4c55dffedafd8a656c27 (diff) | |
| download | FreeBSD-src-99ed11b97d20806dd7a7c8ef3162cf72cc36dd75.zip FreeBSD-src-99ed11b97d20806dd7a7c8ef3162cf72cc36dd75.tar.gz | |
- In the bridge_enqueue() do success/error accounting for
each fragment, not only once.
- In the GRAB_OUR_PACKETS() macro do increase if_ibytes.
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 69ff541..ad7befa 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1783,13 +1783,12 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m) short mflags; struct mbuf *m0; - len = m->m_pkthdr.len; - mflags = m->m_flags; - /* We may be sending a fragment so traverse the mbuf */ for (; m; m = m0) { m0 = m->m_nextpkt; m->m_nextpkt = NULL; + len = m->m_pkthdr.len; + mflags = m->m_flags; /* * If underlying interface can not do VLAN tag insertion itself @@ -1809,11 +1808,10 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m) if ((err = dst_ifp->if_transmit(dst_ifp, m))) { m_freem(m0); + sc->sc_ifp->if_oerrors++; break; } - } - if (err == 0) { sc->sc_ifp->if_opackets++; sc->sc_ifp->if_obytes += len; if (mflags & M_MCAST) @@ -2303,6 +2301,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) if ((iface)->if_type == IFT_BRIDGE) { \ ETHER_BPF_MTAP(iface, m); \ iface->if_ipackets++; \ + iface->if_ibytes += m->m_pkthdr.len; \ /* Filter on the physical interface. */ \ if (pfil_local_phys && \ (PFIL_HOOKED(&V_inet_pfil_hook) \ |
