diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-09-27 18:10:43 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-09-27 18:10:43 +0000 |
| commit | a42af632d87879621ea936244e0eb8a934e9054c (patch) | |
| tree | 06d50385e76f077f148ab914f1e6e424fbea50a1 /sys/netinet/if_ether.c | |
| parent | ef35b51d9d50287690c02c0c566d37a0a97161db (diff) | |
| download | FreeBSD-src-a42af632d87879621ea936244e0eb8a934e9054c.zip FreeBSD-src-a42af632d87879621ea936244e0eb8a934e9054c.tar.gz | |
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)
Diffstat (limited to 'sys/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 4 |
1 files changed, 1 insertions, 3 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)); |
