Move code to handle BPF and bridging for incoming Ethernet packets out

of the individual drivers and into the common routine ether_input().
Also, remove the (incomplete) hack for matching ethernet headers
in the ip_fw code.

The good news: net result of 1016 lines removed, and this should make
bridging now work with *all* Ethernet drivers.

The bad news: it's nearly impossible to test every driver, especially
for bridging, and I was unable to get much testing help on the mailing
lists.

Reviewed by:	freebsd-net

1 files changed, 0 insertions, 17 deletions

diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 166e01a..d804999 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -761,23 +761,6 @@ ex_rx_intr(struct ex_softc *sc)
 		} /* QQQ */
 	}
 #endif
-				if (ifp->if_bpf != NULL) {
-					bpf_mtap(ifp, ipkt);
-
-		/*
-		 * Note that the interface cannot be in promiscuous mode
-		 * if there are no BPF listeners. And if we are in
-		 * promiscuous mode, we have to check if this packet is
-		 * really ours.
-		 */
-					if ((ifp->if_flags & IFF_PROMISC) &&
-					    (eh->ether_dhost[0] & 1) == 0 &&
-					    bcmp(eh->ether_dhost, sc->arpcom.ac_enaddr, sizeof(eh->ether_dhost)) != 0 &&
-					    bcmp(eh->ether_dhost, etherbroadcastaddr, sizeof(eh->ether_dhost)) != 0) {
-						m_freem(ipkt);
-						goto rx_another;
-					}
-				}
 				m_adj(ipkt, sizeof(struct ether_header));
 				ether_input(ifp, eh, ipkt);
 				ifp->if_ipackets++;