CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Fri Sep 12 04:10:24 UTC 2014

Modified Files:
        src/sys/net: if_vlan.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 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.71 src/sys/net/if_vlan.c:1.72
--- src/sys/net/if_vlan.c:1.71	Fri Sep 12 03:44:27 2014
+++ src/sys/net/if_vlan.c	Fri Sep 12 04:10:24 2014
@@ -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 @@ vlan_input(struct ifnet *ifp, struct mbu
 
 	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);
 }