diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-04 12:12:01 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-04 12:12:01 +0000 |
| commit | b7e59297cb5c784067ee40d96174076043140730 (patch) | |
| tree | d84b71ad4933efb3509a88da5af2222affd8438a /sys/dev/pci | |
| parent | 47528c666a66b5f625fb95953f94dd2d78bd169b (diff) | |
replace the ifqueues in net80211 with mbuf_queues.
the specific queues are ic_mgtq, ic_pwrsaveq, and ni_savedq. rtw
had its own queue for beacons.
tested by mpi@ and jmc@
ok mpi@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_rtwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index a1b647b91be..2de408640ab 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.62 2015/10/25 13:04:28 mpi Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.63 2015/11/04 12:11:59 dlg Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -5591,7 +5591,7 @@ iwm_start(struct ifnet *ifp) } /* need to send management frames even if we're not RUNning */ - IF_DEQUEUE(&ic->ic_mgtq, m); + m = mq_dequeue(&ic->ic_mgtq); if (m) { ni = m->m_pkthdr.ph_cookie; goto sendit; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 0b1aa9b35f7..9a1d3edbdc4 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.145 2015/10/25 13:04:28 mpi Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.146 2015/11/04 12:11:59 dlg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -3046,7 +3046,7 @@ iwn_start(struct ifnet *ifp) break; } /* Send pending management frames first. */ - IF_DEQUEUE(&ic->ic_mgtq, m); + m = mq_dequeue(&ic->ic_mgtq); if (m != NULL) { ni = m->m_pkthdr.ph_cookie; goto sendit; diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c index a55f99a94b4..08f1236722b 100644 --- a/sys/dev/pci/if_rtwn.c +++ b/sys/dev/pci/if_rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtwn.c,v 1.7 2015/10/25 13:04:28 mpi Exp $ */ +/* $OpenBSD: if_rtwn.c,v 1.8 2015/11/04 12:11:59 dlg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1871,7 +1871,7 @@ rtwn_start(struct ifnet *ifp) break; } /* Send pending management frames first. */ - IF_DEQUEUE(&ic->ic_mgtq, m); + m = mq_dequeue(&ic->ic_mgtq); if (m != NULL) { ni = m->m_pkthdr.ph_cookie; goto sendit; diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 4defce0f8ca..eabfee0fd67 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.129 2015/10/25 13:04:28 mpi Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.130 2015/11/04 12:11:59 dlg Exp $ */ /*- * Copyright (c) 2006-2008 @@ -1905,7 +1905,7 @@ wpi_start(struct ifnet *ifp) break; } /* Send pending management frames first. */ - IF_DEQUEUE(&ic->ic_mgtq, m); + m = mq_dequeue(&ic->ic_mgtq); if (m != NULL) { ni = m->m_pkthdr.ph_cookie; goto sendit; |