Remove bridge(4) from the tree. if_bridge(4) is a full functional

replacement and has additional features which make it superior.

Discussed on:	-arch
Reviewed by:	thompsa
X-MFC-after:	never (RELENG_6 as transition period)

4 files changed, 3 insertions, 28 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index e5d1073..ec5a7a7 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -37,7 +37,6 @@
  */
 
 #include "opt_inet.h"
-#include "opt_bdg.h"
 #include "opt_mac.h"
 #include "opt_carp.h"
 
@@ -59,7 +58,6 @@
 #include <net/netisr.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
-#include <net/bridge.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -607,7 +605,7 @@ in_arpinput(m)
 	int carp_match = 0;
 #endif
 
-	if (do_bridge || ifp->if_bridge)
+	if (ifp->if_bridge)
 		bridged = 1;
 
 	req_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 0f57afe..51a3ad6 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -79,7 +79,6 @@
 #include <netinet/ip_var.h>
 
 #include <netinet/if_ether.h> /* for struct arpcom */
-#include <net/bridge.h>
 
 #include <netinet/ip6.h>       /* for ip6_input, ip6_output prototypes */
 #include <netinet6/ip6_var.h>
@@ -488,27 +487,6 @@ transmit_event(struct dn_pipe *pipe)
 
 	    break;
 
-	case DN_TO_BDG_FWD :
-	    /*
-	     * The bridge requires/assumes the Ethernet header is
-	     * contiguous in the first mbuf header.  Insure this is true.
-	     */
-	    if (BDG_LOADED) {
-		if (m->m_len < ETHER_HDR_LEN &&
-		    (m = m_pullup(m, ETHER_HDR_LEN)) == NULL) {
-		    printf("dummynet/bridge: pullup fail, dropping pkt\n");
-		    break;
-		}
-		m = bdg_forward_ptr(m, pkt->ifp);
-	    } else {
-		/* somebody unloaded the bridge module. Drop pkt */
-		/* XXX rate limit */
-		printf("dummynet: dropping bridged packet trapped in pipe\n");
-	    }
-	    if (m)
-		m_freem(m);
-	    break;
-
 	case DN_TO_ETH_DEMUX:
 	    /*
 	     * The Ethernet code assumes the Ethernet header is
@@ -1175,7 +1153,6 @@ locate_flowset(int pipe_nr, struct ip_fw *rule)
  * m		the mbuf with the packet
  * ifp		the 'ifp' parameter from the caller.
  *		NULL in ip_input, destination interface in ip_output,
- *		real_dst in bdg_forward
  * rule		matching rule, in case of multiple passes
  * flags	flags from the caller, only used in ip_output
  *
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 72a8863..b98ee4c 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -121,7 +121,7 @@ struct dn_pkt_tag {
     int dn_dir;			/* action when packet comes out. */
 #define DN_TO_IP_OUT	1
 #define DN_TO_IP_IN	2
-#define DN_TO_BDG_FWD	3
+/* Obsolete: #define DN_TO_BDG_FWD	3 */
 #define DN_TO_ETH_DEMUX	4
 #define DN_TO_ETH_OUT	5
 #define DN_TO_IP6_IN	6
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c
index dd6d70d..4061596 100644
--- a/sys/netinet/ip_fw2.c
+++ b/sys/netinet/ip_fw2.c
@@ -2076,7 +2076,7 @@ ipfw_chk(struct ip_fw_args *args)
 
 	/*
 	 * oif | args->oif	If NULL, ipfw_chk has been called on the
-	 *	inbound path (ether_input, bdg_forward, ip_input).
+	 *	inbound path (ether_input, ip_input).
 	 *	If non-NULL, ipfw_chk has been called on the outbound path
 	 *	(ether_output, ip_output).
 	 */