summaryrefslogtreecommitdiffstats
path: root/sys/dev/sn
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2006-02-04 08:19:00 +0000
committerimp <imp@FreeBSD.org>2006-02-04 08:19:00 +0000
commit9fc122768df39f23fbfd9539296c963ed3baf4d3 (patch)
tree49f234ff0d307029305112657cc5a5ae74f89390 /sys/dev/sn
parent0d5e7bdb81693de2484445a34cff3662682dd8e4 (diff)
downloadFreeBSD-src-9fc122768df39f23fbfd9539296c963ed3baf4d3.zip
FreeBSD-src-9fc122768df39f23fbfd9539296c963ed3baf4d3.tar.gz
Fix mismerge after last cvs update for the IFQ_DRV_DEQUEUE changes.
Diffstat (limited to 'sys/dev/sn')
-rw-r--r--sys/dev/sn/if_sn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index b24ec14..3845bf3 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -405,7 +405,7 @@ startagain:
if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
if_printf(ifp, "large packet discarded (A)\n");
++ifp->if_oerrors;
- IF_DRV_DEQUEUE(&ifp->if_snd, m);
+ IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
m_freem(m);
goto readcheck;
}
@@ -498,7 +498,7 @@ startagain:
* Get the packet from the kernel. This will include the Ethernet
* frame header, MAC Addresses etc.
*/
- IF_DRV_DEQUEUE(&ifp->if_snd, m);
+ IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
/*
* Push out the data to the card.
@@ -621,7 +621,7 @@ snresume(struct ifnet *ifp)
if (len + pad > ETHER_MAX_LEN - ETHER_CRC_LEN) {
if_printf(ifp, "large packet discarded (B)\n");
++ifp->if_oerrors;
- IF_DRV_DEQUEUE(&ifp->if_snd, m);
+ IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
m_freem(m);
return;
}
@@ -697,7 +697,7 @@ snresume(struct ifnet *ifp)
* Get the packet from the kernel. This will include the Ethernet
* frame header, MAC Addresses etc.
*/
- IF_DRV_DEQUEUE(&ifp->if_snd, m);
+ IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
/*
* Push out the data to the card.
OpenPOWER on IntegriCloud