summaryrefslogtreecommitdiffstats
path: root/sys/netgraph
diff options
context:
space:
mode:
authormlaier <mlaier@FreeBSD.org>2005-09-27 18:10:43 +0000
committermlaier <mlaier@FreeBSD.org>2005-09-27 18:10:43 +0000
commita42af632d87879621ea936244e0eb8a934e9054c (patch)
tree06d50385e76f077f148ab914f1e6e424fbea50a1 /sys/netgraph
parentef35b51d9d50287690c02c0c566d37a0a97161db (diff)
downloadFreeBSD-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/netgraph')
-rw-r--r--sys/netgraph/ng_ether.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index be6c76f..ae1cb58 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -55,7 +55,6 @@
#include <sys/syslog.h>
#include <sys/socket.h>
-#include <net/bridge.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -644,9 +643,7 @@ ng_ether_rcv_upper(node_p node, struct mbuf *m)
m->m_pkthdr.rcvif = priv->ifp;
- if (BDG_ACTIVE(priv->ifp) )
- if ((m = bridge_in_ptr(priv->ifp, m)) == NULL)
- return (0);
+ /* XXX: if_bridge hook here? */
/* Route packet back in */
ether_demux(priv->ifp, m);
OpenPOWER on IntegriCloud