Module Name: src
Committed By: snj
Date: Thu Apr 23 19:23:45 UTC 2015
Modified Files:
src/sys/net [netbsd-7]: if_vlan.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #710):
sys/net/if_vlan.c: revision 1.81
Count up parent's obytes and omcasts counters
PR kern/49837
To generate a diff of this commit:
cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/sys/net/if_vlan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.70.2.2 src/sys/net/if_vlan.c:1.70.2.3
--- src/sys/net/if_vlan.c:1.70.2.2 Sat Apr 4 14:56:48 2015
+++ src/sys/net/if_vlan.c Thu Apr 23 19:23:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.70.2.2 2015/04/04 14:56:48 martin Exp $ */
+/* $NetBSD: if_vlan.c,v 1.70.2.3 2015/04/23 19:23:45 snj Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.70.2.2 2015/04/04 14:56:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.70.2.3 2015/04/23 19:23:45 snj Exp $");
#include "opt_inet.h"
@@ -821,6 +821,10 @@ vlan_start(struct ifnet *ifp)
}
ifp->if_opackets++;
+
+ p->if_obytes += m->m_pkthdr.len;
+ if (m->m_flags & M_MCAST)
+ p->if_omcasts++;
if ((p->if_flags & (IFF_RUNNING|IFF_OACTIVE)) == IFF_RUNNING)
(*p->if_start)(p);
}