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

Fix mismerge after last cvs update for the IFQ_DRV_DEQUEUE changes.

Browse Source
This commit is contained in:
Warner Losh 2006-02-04 08:19:00 +00:00
parent e0c1d667ec
commit d68da9fe4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/sn/if_sn.c
View File

@ -405,7 +405,7 @@ snstart_locked(struct ifnet *ifp)
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 @@ snstart_locked(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.
@ -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.