[src/netbsd-7]: src/sys/net Pull up following revision(s) (requested by ozaki...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c04a66c4f4ad
branches:  netbsd-7
changeset: 799247:c04a66c4f4ad
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Apr 23 19:23:45 2015 +0000

description:
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

diffstat:

 sys/net/if_vlan.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 9bc41a708521 -r c04a66c4f4ad sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Thu Apr 23 18:52:55 2015 +0000
+++ b/sys/net/if_vlan.c Thu Apr 23 19:23:45 2015 +0000
@@ -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 @@
                }
 
                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);
        }