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

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

10 files changed, 10 insertions, 10 deletions

diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index fc634c0..020d302 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -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) {
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 9b05c95..c1d6858 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -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;
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index d93a69f..b830cf3 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -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) {
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index baeb090..0c54827 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -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;
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 79a8169..f728f88 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -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);
 
 	}
 
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index de9b273..869164a 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -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++;
 	}
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index 451ee12..caca238 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -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) {
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 634e611..91d571b 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -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) {
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index dfa261f..521a49c 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -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));
 	}
 
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index ab94094..466e4fc 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -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) {