diff options
author | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-08-30 00:05:04 +0000 |
---|---|---|
committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-08-30 00:05:04 +0000 |
commit | 35d3dd8b127619c9cd820a67499cf9fccb35333b (patch) | |
tree | e50b20855da6e4313e6bcfd1aa4b27f305602ef0 /sys | |
parent | b2005c033ea37ff4129a33999ef1cc6c681526fb (diff) | |
download | src-35d3dd8b127619c9cd820a67499cf9fccb35333b.tar.gz src-35d3dd8b127619c9cd820a67499cf9fccb35333b.zip |
Use mbuf queue instead of ifqueue in USB network drivers.
Reviewed by: stevek
Notes
Notes:
svn path=/head/; revision=351616
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/net/if_axe.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/net/if_axge.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/net/usb_ethernet.c | 6 | ||||
-rw-r--r-- | sys/dev/usb/net/usb_ethernet.h | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index 058a46293e6a..8b84ec68aa89 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -1149,7 +1149,7 @@ axe_rxeof(struct usb_ether *ue, struct usb_page_cache *pc, unsigned int offset, } } - _IF_ENQUEUE(&ue->ue_rxq, m); + (void)mbufq_enqueue(&ue->ue_rxq, m); return (0); } diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c index 2a170c2eedd4..f6e17b5a180c 100644 --- a/sys/dev/usb/net/if_axge.c +++ b/sys/dev/usb/net/if_axge.c @@ -1041,7 +1041,7 @@ axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc, unsigned int offset, } if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); - _IF_ENQUEUE(&ue->ue_rxq, m); + (void)mbufq_enqueue(&ue->ue_rxq, m); } static void diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 3dda564d523b..57be7d69d4ab 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -598,7 +598,7 @@ uether_rxmbuf(struct usb_ether *ue, struct mbuf *m, m->m_pkthdr.len = m->m_len = len; /* enqueue for later when the lock can be released */ - _IF_ENQUEUE(&ue->ue_rxq, m); + (void)mbufq_enqueue(&ue->ue_rxq, m); return (0); } @@ -628,7 +628,7 @@ uether_rxbuf(struct usb_ether *ue, struct usb_page_cache *pc, m->m_pkthdr.len = m->m_len = len; /* enqueue for later when the lock can be released */ - _IF_ENQUEUE(&ue->ue_rxq, m); + (void)mbufq_enqueue(&ue->ue_rxq, m); return (0); } @@ -641,7 +641,7 @@ uether_rxflush(struct usb_ether *ue) UE_LOCK_ASSERT(ue, MA_OWNED); for (;;) { - _IF_DEQUEUE(&ue->ue_rxq, m); + m = mbufq_dequeue(&ue->ue_rxq); if (m == NULL) break; diff --git a/sys/dev/usb/net/usb_ethernet.h b/sys/dev/usb/net/usb_ethernet.h index 2cffac91b7f7..a0b1db4e1c02 100644 --- a/sys/dev/usb/net/usb_ethernet.h +++ b/sys/dev/usb/net/usb_ethernet.h @@ -41,12 +41,10 @@ #include <sys/limits.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> -#include <net/ifq.h> #include <net/bpf.h> #include <net/ethernet.h> @@ -89,7 +87,7 @@ struct usb_ether { struct usb_process ue_tq; struct sysctl_ctx_list ue_sysctl_ctx; - struct ifqueue ue_rxq; + struct mbufq ue_rxq; struct usb_callout ue_watchdog; struct usb_ether_cfg_task ue_sync_task[2]; struct usb_ether_cfg_task ue_media_task[2]; |