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

Catch up the rest of the drivers with the ether_vlan_mtap modifications.

Browse Source 
If these drivers are setting M_VLANTAG because they are stripping the
layer 2 802.1Q headers, then they need to be re-inserting them so any
bpf(4) peers can properly decode them.

It should be noted that this is compiled tested only.

MFC after:	3 weeks
This commit is contained in:
csjp 2007-03-04 03:38:08 +00:00
parent 634904f272
commit 17dc3a8d0b
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/bce/if_bce.c
View File

@ -4726,7 +4726,7 @@ bce_start_locked(struct ifnet *ifp)
count++;
/* Send a copy of the frame to any BPF listeners. */
BPF_MTAP(ifp, m_head);
ETHER_BPF_MTAP(ifp, m_head);
}
if (count == 0) {

2
sys/dev/ixgb/if_ixgb.c
View File

@ -475,7 +475,7 @@ ixgb_start_locked(struct ifnet * ifp)
if (ifp->if_bpf)
bpf_mtap(ifp, m_head);
#else
BPF_MTAP(ifp, m_head);
ETHER_BPF_MTAP(ifp, m_head);
#endif
/* Set timeout in case hardware has problems transmitting */
ifp->if_timer = IXGB_TX_TIMEOUT;

2
sys/dev/msk/if_msk.c
View File

@ -2870,7 +2870,7 @@ msk_start(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 (enq > 0) {

2
sys/dev/nfe/if_nfe.c
View File

@ -1700,7 +1700,7 @@ nfe_start_locked(struct ifnet *ifp)
/* packet put in h/w queue, remove from s/w queue */
IFQ_DEQUEUE(&ifp->if_snd, m0);
BPF_MTAP(ifp, m0);
ETHER_BPF_MTAP(ifp, m0);
}
if (sc->txq.cur == old) { /* nothing sent */
return;

2
sys/dev/nge/if_nge.c
View File

@ -1613,7 +1613,7 @@ nge_start_locked(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);
}

2
sys/dev/re/if_re.c
View File

@ -2214,7 +2214,7 @@ re_start(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);
queued++;
}

2
sys/dev/stge/if_stge.c
View File

@ -1346,7 +1346,7 @@ stge_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 (enq > 0) {

2
sys/dev/ti/if_ti.c
View File

@ -3120,7 +3120,7 @@ ti_start_locked(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 (enq > 0) {

2
sys/dev/txp/if_txp.c
View File

@ -1350,7 +1350,7 @@ txp_start_locked(ifp)
ifp->if_timer = 5;
BPF_MTAP(ifp, m);
ETHER_BPF_MTAP(ifp, m);
WRITE_REG(sc, r->r_reg, TXP_IDX2OFFSET(prod));
}

2
sys/dev/vge/if_vge.c
View File

@ -1847,7 +1847,7 @@ vge_start(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 (idx == sc->vge_ldata.vge_tx_prodidx) {