Adapt bridge(4) to the new if_input() framework.

Move bridge_input() outside of ether_input() in order to duplicate packets
flowing through a bridge port before applying any transformation on mbufs.

This saves a various m_adj(9)/M_PREPEND(9) dances and remove the bridge(4)
hack from vlan(4).

Tested by mxb <mxb AT alumni DOT chalmers DOT se> and kettenis@

ok bluhm@

1 files changed, 1 insertions, 14 deletions

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 6371b96536b..8c359fde4e9 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.129 2015/06/16 11:09:39 mpi Exp $	*/
+/*	$OpenBSD: if_vlan.c,v 1.130 2015/06/23 09:42:23 mpi Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -70,11 +70,6 @@
 #include <net/bpf.h>
 #endif
 
-#include "bridge.h"
-#if NBRIDGE > 0
-#include <net/if_bridge.h>
-#endif
-
 u_long vlan_tagmask, svlan_tagmask;
 
 #define TAG_HASH_SIZE		32
@@ -304,14 +299,6 @@ vlan_input(struct mbuf *m)
 	}
 
 	if (ifv == NULL) {
-#if NBRIDGE > 0
-		/*
-		 * If the packet hasn't been through its bridge(4) give
-		 * it a chance.
-		 */
-		if (ifp->if_bridgeport && (m->m_flags & M_PROTO1) == 0)
-			return (0);
-#endif
 		ifp->if_noproto++;
 		m_freem(m);
 		return (1);