[src/trunk]: src/sys/net Call if_input of vlan interface itself, not parent's...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d660df601c28
branches:  trunk
changeset: 332219:d660df601c28
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Sep 12 04:10:24 2014 +0000

description:
Call if_input of vlan interface itself, not parent's one

And also we need to drop M_PROMISC before calling if_input;
it was originally at just before bridge_input in ether_input.

Then we can bridge vlan interfaces again.

diffstat:

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

diffs (27 lines):

diff -r f429cdb7381e -r d660df601c28 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Fri Sep 12 03:44:27 2014 +0000
+++ b/sys/net/if_vlan.c Fri Sep 12 04:10:24 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.71 2014/09/12 03:44:27 ozaki-r Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.72 2014/09/12 04:10:24 ozaki-r 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.71 2014/09/12 03:44:27 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.72 2014/09/12 04:10:24 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -895,6 +895,6 @@
 
        bpf_mtap(&ifv->ifv_if, m);
 
-       /* Pass it back through the parent's input routine. */
-       (*ifp->if_input)(&ifv->ifv_if, m);
+       m->m_flags &= ~M_PROMISC;
+       ifv->ifv_if.if_input(&ifv->ifv_if, m);
 }