diff options
| author | wpaul <wpaul@FreeBSD.org> | 1999-09-17 18:25:30 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1999-09-17 18:25:30 +0000 |
| commit | f7b8014eb79ba484d605f8b4d727a8c0f7766ad9 (patch) | |
| tree | 0d38ba2e663a4443a93a96c3773cd963df64f1a0 /sys | |
| parent | 8afddec372ea41ee4cc17dadb9bb742d08ee7142 (diff) | |
| download | FreeBSD-src-f7b8014eb79ba484d605f8b4d727a8c0f7766ad9.zip FreeBSD-src-f7b8014eb79ba484d605f8b4d727a8c0f7766ad9.tar.gz | |
Patch if_vr to add bridging support.
PR: 12385
Submitted by: lyndon@orthanc.ab.ca
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/vr/if_vr.c | 21 | ||||
| -rw-r--r-- | sys/pci/if_vr.c | 21 |
2 files changed, 40 insertions, 2 deletions
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index cae329a..1e47ec1 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -79,6 +79,11 @@ #include <net/bpf.h> #endif +#include "opt_bdg.h" +#ifdef BRIDGE +#include <net/bridge.h> +#endif /* BRIDGE */ + #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ @@ -1415,7 +1420,21 @@ static void vr_rxeof(sc) continue; } } -#endif +#endif /* NBPF>0 */ +#ifdef BRIDGE + if (do_bridge) { + struct ifnet *bdg_ifp; + bdg_ifp = bridge_in(m); + if (bdg_ifp != BDG_LOCAL && bdg_ifp != BDG_DROP) + bdg_forward(&m, bdg_ifp); + if (((bdg_ifp != BDG_LOCAL) && (bdg_ifp != BDG_BCAST) && + (bdg_ifp != BDG_MCAST)) || bdg_ifp == BDG_DROP) { + m_freem(m); + continue; + } + } +#endif /* BRIDGE */ + /* Remove header from mbuf and pass it on. */ m_adj(m, sizeof(struct ether_header)); ether_input(ifp, eh, m); diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index cae329a..1e47ec1 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -79,6 +79,11 @@ #include <net/bpf.h> #endif +#include "opt_bdg.h" +#ifdef BRIDGE +#include <net/bridge.h> +#endif /* BRIDGE */ + #include <vm/vm.h> /* for vtophys */ #include <vm/pmap.h> /* for vtophys */ #include <machine/clock.h> /* for DELAY */ @@ -1415,7 +1420,21 @@ static void vr_rxeof(sc) continue; } } -#endif +#endif /* NBPF>0 */ +#ifdef BRIDGE + if (do_bridge) { + struct ifnet *bdg_ifp; + bdg_ifp = bridge_in(m); + if (bdg_ifp != BDG_LOCAL && bdg_ifp != BDG_DROP) + bdg_forward(&m, bdg_ifp); + if (((bdg_ifp != BDG_LOCAL) && (bdg_ifp != BDG_BCAST) && + (bdg_ifp != BDG_MCAST)) || bdg_ifp == BDG_DROP) { + m_freem(m); + continue; + } + } +#endif /* BRIDGE */ + /* Remove header from mbuf and pass it on. */ m_adj(m, sizeof(struct ether_header)); ether_input(ifp, eh, m); |
