diff options
| author | jkim <jkim@FreeBSD.org> | 2006-12-20 01:12:07 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2006-12-20 01:12:07 +0000 |
| commit | 0e3caf5297645ad57159029ebbddc3188d3f00ce (patch) | |
| tree | 6603170371fa16c4bbe8b5268bf052cb3700789a /sys/dev | |
| parent | a0ce97439a3ba712e7d861fa80906b24439d288c (diff) | |
| download | FreeBSD-src-0e3caf5297645ad57159029ebbddc3188d3f00ce.zip FreeBSD-src-0e3caf5297645ad57159029ebbddc3188d3f00ce.tar.gz | |
Partially back out rev. 1.148 and use new ETHER_BPF_MTAP() macro for VLAN.
Remaining changes are cosmetic.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bge/if_bge.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 1035083..5bd13cb 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -964,16 +964,11 @@ bge_setpromisc(struct bge_softc *sc) ifp = sc->bge_ifp; - /* - * Enable or disable promiscuous mode as needed. - * Do not strip VLAN tag when promiscuous mode is enabled. - */ + /* Enable or disable promiscuous mode as needed. */ if (ifp->if_flags & IFF_PROMISC) - BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC | - BGE_RXMODE_RX_KEEP_VLAN_DIAG); + BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC); else - BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC | - BGE_RXMODE_RX_KEEP_VLAN_DIAG); + BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC); } static void @@ -2756,8 +2751,7 @@ bge_rxeof(struct bge_softc *sc) rxidx = cur_rx->bge_idx; BGE_INC(sc->bge_rx_saved_considx, sc->bge_return_ring_cnt); - if (!(ifp->if_flags & IFF_PROMISC) && - (cur_rx->bge_flags & BGE_RXBDFLAG_VLAN_TAG)) { + if (cur_rx->bge_flags & BGE_RXBDFLAG_VLAN_TAG) { have_tag = 1; vlan_tag = cur_rx->bge_vlan_tag; } @@ -3340,7 +3334,7 @@ bge_start_locked(struct ifnet *ifp) * If there's a BPF listener, bounce a copy of this frame * to him. */ - BPF_MTAP(ifp, m_head); + ETHER_BPF_MTAP(ifp, m_head); } if (count == 0) |
