d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially back out rev. 1.148 and use new ETHER_BPF_MTAP() macro for VLAN.

Browse Source 
Remaining changes are cosmetic.
This commit is contained in:
Jung-uk Kim 2006-12-20 01:12:07 +00:00
parent bd8e6f87c8
commit 45ee6ab350
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=165363
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/bge/if_bge.c
View File

@ -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)