git: 8b0acd853845 - main - mtw: fix compilation with IEEE80211_SUPPORT_SUPERG enabled
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Mar 2025 19:04:24 UTC
The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8b0acd8538459b40b89ce4265ba99d035f08b4e0 commit 8b0acd8538459b40b89ce4265ba99d035f08b4e0 Author: Adrian Chadd <adrian@FreeBSD.org> AuthorDate: 2025-03-25 18:03:42 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> CommitDate: 2025-03-28 18:59:35 +0000 mtw: fix compilation with IEEE80211_SUPPORT_SUPERG enabled It looks like this was missed during the driver development and porting. Differential Revision: https://reviews.freebsd.org/D49512 Reviewed by: thj --- sys/dev/usb/wlan/if_mtw.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/wlan/if_mtw.c b/sys/dev/usb/wlan/if_mtw.c index b42ed336d18e..1eb7869decfa 100644 --- a/sys/dev/usb/wlan/if_mtw.c +++ b/sys/dev/usb/wlan/if_mtw.c @@ -53,6 +53,9 @@ #include <net80211/ieee80211_radiotap.h> #include <net80211/ieee80211_ratectl.h> #include <net80211/ieee80211_regdomain.h> +#ifdef IEEE80211_SUPPORT_SUPERG +#include <net80211/ieee80211_superg.h> +#endif #include <netinet/if_ether.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -2801,10 +2804,10 @@ mtw_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index) #ifdef IEEE80211_SUPPORT_SUPERG /* XXX TODO: make this deferred rather than unlock/relock */ /* XXX TODO: should only do the QoS AC this belongs to */ - if (pq->tx_nfree >= RUN_TX_RING_COUNT) { - RUN_UNLOCK(sc); + if (pq->tx_nfree >= MTW_TX_RING_COUNT) { + MTW_UNLOCK(sc); ieee80211_ff_flush_all(ic); - RUN_LOCK(sc); + MTW_LOCK(sc); } #endif }