From nobody Fri Mar 28 19:04:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZPVLw5GqMz5rHYP; Fri, 28 Mar 2025 19:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPVLw4RkKz3DWc; Fri, 28 Mar 2025 19:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743188664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YV+9XU6Nww/PsBld++bRtcXYuRVDp7Sby9PGlibYAH8=; b=aU2yy8fWb6vmWhq0rgs2KEdsOzXWY6JfggCcR/DhxiEyvEXvw+RWkRMVrLDJcVrMxnErrs d5hPbfGRxuvOrQyyJLeZoF+DWuQ87g63MH3g3nA0oWRTPMVR4DLuIFUFG4o07RLnyqAbZq lFmUfk4dEo14q8WsgjHGC58Pd6sumXzj1iCUmtckQYnwWDXDyawusMLdLg0pPM+fGy9+jv 9J4GhAx0F8aBID8884qI1AZ3PeAYCiPdnbhipCo3vnhLA4y/gc/c8Iy568mlgi04fpUFFg v3AgD0bqKOYSH2JhBbLTjVNQ1G02wYD4a793ag8Vd3tpYaLWNJeFCuINkpUsaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743188664; a=rsa-sha256; cv=none; b=uryBdlNhr/OOfclzL8ecGr5HL0HOVDq0j7rMlL2w6Lp72x1LiY0DREG4rG4fr0qWfMbt7q tpAfDUqwFIct0rW1Kuq+eKBcMXtaj9qG5ChhTg/7P1OOcw5XfPAPCpjascorbDZlBW0tB3 8mkw+Ree3BpKjZMgSZQmQbRlhRnPwvZrZ+4mVqyA/EX6ZkEBN2sVV2UbfpCpMDjEWWKLEo wL6Fg2kZ4r8711ReekfTF8kkrEvmIW5hgbvHzt1G/cr8LDQO84dImSzxIOmtfZSRV/vD7Y t9AN+QXadbPpBvlTus5aXw+U8plg7q6FJ8oMC6nHCe/up524BvvsQhHxOCNSMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743188664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YV+9XU6Nww/PsBld++bRtcXYuRVDp7Sby9PGlibYAH8=; b=Wflbtl3KHk9Y7+GtPhzLICwPxyykIDG5xW1Nuvv7aW0GsbDOnrD0L67YlKzim20fNsQSus hg/Fljybn4DHBGNfy7nH3kH7j1GqioCp1VS5xxspku1CF/6T4cHiP2lfrM0CYTi3vDUOSR x1YrV+HEvfjilT/E11I4HVjb60yzS/x3ejTHkeMqzrm3sz8tm6tKTBvgj2V5wlglBJmArS SalpmNjdmr75+zhI/1OPs4WKwA4Sctnni4Bz8R6zah36rhF82/NPQ0l/4gvySHC4TyUiLQ d8BVyt/5lO3KfwPisqBpah5OdP9PBDUv4sHsj2iOUPJF27WjXnFpftdX4b6TrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZPVLw43LVzw9b; Fri, 28 Mar 2025 19:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52SJ4Oko022602; Fri, 28 Mar 2025 19:04:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SJ4OrE022599; Fri, 28 Mar 2025 19:04:24 GMT (envelope-from git) Date: Fri, 28 Mar 2025 19:04:24 GMT Message-Id: <202503281904.52SJ4OrE022599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8b0acd853845 - main - mtw: fix compilation with IEEE80211_SUPPORT_SUPERG enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b0acd8538459b40b89ce4265ba99d035f08b4e0 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8b0acd8538459b40b89ce4265ba99d035f08b4e0 commit 8b0acd8538459b40b89ce4265ba99d035f08b4e0 Author: Adrian Chadd AuthorDate: 2025-03-25 18:03:42 +0000 Commit: Adrian Chadd 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 #include #include +#ifdef IEEE80211_SUPPORT_SUPERG +#include +#endif #include #include #include @@ -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 }