svn commit: r280622 - head/sys/net
Gleb Smirnoff
glebius at FreeBSD.org
Wed Mar 25 16:01:47 UTC 2015
Author: glebius
Date: Wed Mar 25 16:01:46 2015
New Revision: 280622
URL: https://svnweb.freebsd.org/changeset/base/280622
Log:
Fix couple of fallouts from r280280. The first one is a simple typo,
where counter was incremented on parent, instead of vlan(4) interface.
The second is more complicated. Historically, in our stack the incoming
packets are accounted in drivers, while incoming bytes for Ethernet
drivers are accounted in ether_input_internal(). Thus, it should be
removed from vlan(4) driver.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Modified:
head/sys/net/if_vlan.c
Modified: head/sys/net/if_vlan.c
==============================================================================
--- head/sys/net/if_vlan.c Wed Mar 25 15:51:41 2015 (r280621)
+++ head/sys/net/if_vlan.c Wed Mar 25 16:01:46 2015 (r280622)
@@ -1163,8 +1163,7 @@ vlan_input(struct ifnet *ifp, struct mbu
TRUNK_RUNLOCK(trunk);
m->m_pkthdr.rcvif = ifv->ifv_ifp;
- if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
- if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
+ if_inc_counter(ifv->ifv_ifp, IFCOUNTER_IPACKETS, 1);
/* Pass it back through the parent's input routine. */
(*ifp->if_input)(ifv->ifv_ifp, m);
More information about the svn-src-head
mailing list