From nobody Sat Sep 26 10:02:05 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81426469835 for ; Wed, 2 Sep 2026 10:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788345714; cv=none; b=oUu0HFj9w7BU+/x5XT9Srzu2znd6XrE2MoABlyMeI5FcPD4/8rpFqFHDmsaPMUqLx4R+3CljzUbMcGQ4gFicHLoJhhgW+ZHxmY7Z0Y0BTZLbNMvoXY+SpQLn7Y/g6pzFHUbP9C1Hn9RdOCYq2GUZSYMTnNkUE7eS9yGMrQKOopo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788345714; c=relaxed/simple; bh=6Y5dZk4fYdTfFsYzaoLTW53k180kqLYI8LAqtF3RXPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=USkITEd2W5nQyr1XAJqd5T2SBYandwOgWhJ2tZecN//caa8txEHhTxJH0RYzGsVbNAv2CW2WWVQy47tXlFffSr+BlcW1rex2LpzZSgnPmTlQJF3ZYzvdN6pnVychFPRaVZlqqQL0pPQvDJym+vVaPUBmRVXxzBtiFcJ/lZ45ek8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eH5t7WcD; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eH5t7WcD" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-48441a2ba1bso597389f8f.1 for ; Wed, 02 Sep 2026 03:41:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788345709; x=1788950509; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=E7J+LYLRSNIiM9iUYMchgZFk3biexps8SwXQ2tzLjc0=; b=eH5t7WcD0WSRh6EdT9p/CfFZXRJbjkAS+XWURXykdhmM93cSLPqApzMc3rbEVQjgdS mtquDa8DUBDt/M8E9Ed7wUXP2wxCj0akHQ6HrhErdFKfqlScoXJm0jxSl+qAbmE2Ya9I cb47+p51/uMbOTK2NzzfVmt2LLvxmKIEEdLR1dg+RJJ2SAAVXAT60khSxHDV78pwvA2t UtKZY+0bWKbNjH+tevXq6YGRkhD9CSPsVKXpyzKF01rxdpZZKCws4RYy5nmb+uMPtom6 14tgQhVpDgpAABi4eyJWyS4NtM3JYFwcCM281n8XLyfFY/Ml3YuDhXbZN1rhtYx183Ez nABg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788345709; x=1788950509; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=E7J+LYLRSNIiM9iUYMchgZFk3biexps8SwXQ2tzLjc0=; b=nbShwFm14a+v01zRuYmNDJasLvqQyKGTvTjKhHCr3Qx6uliLXBqSMlSjvsyKCTjcng ed6nnGG9MA0Cn7p8ziJaDtIGAMI4rm8HNy43izd80WKmDo1EbvOWvpCAipjyMoqjYSF7 5LcpfadnY/N5pI0s6bgVsFkHhpLM33KuT2hZ43LFIObegCS8ndxo5HmUyuUQGxoeKucX YDMv9jbPeKlGfDno3QV3v/ON+2OEXrYtXD0MJBeShOw0qbvSOF+ZV8OyR1XowbqhLmHx 30lfjs8kuT1b6lY390PuC8UzdUPObf/oVmMzN/uRbYCuPHnIgIi1DqVM63NVW2wvjEBd AE4A== X-Forwarded-Encrypted: i=1; AKwUvBxapXfcDGpqaVI6cG334oOf6/TPzwiidNm/mLVbgsFQ0sO3UthDW7NTOSaGKTeCWXiWkZIB3s6f4efrm3Y=@vger.kernel.org X-Gm-Message-State: AFuF++n8x0plymkn9eWbOwwHTi7vHMpmbEsRVqZVihUbh48fmMq004zz afLvVUxVG5jyWDtGBpqgkQDzjeCFPJfgYqUJP6GgqBW8HsDkTZthalfs X-Gm-Gg: AYBFou1TGOu7yPEnkMAntPdKk0AXDuLafq2hhW6EazLlxJrENhD/dt/Lq252UlMGV36 CEkCJ+a7t5wWxKvkbt5mOcMSKV8nZifjylG86p+Pv2O2Up6BiHFIsBjaePb4lc89D8u551n9TSF gSdM/e8HhqA2RUCoIrK67qo85Vl8iIgCoh0F3RBc6GIM7BExQBmlQ44mVA4R9G+X04TlwcLI2Kl va3FvS+m318GtiSI9cUErLcNoBYU/ejnT+Zf777dqTyCzF6qxFVKfNK4QfU/eOyRfOGPMvfhQvz EphLLAZqTZiCGfX9OqTdM/+WHdIJErqdFrw9dDGVh8JNQ9bioYY5KmVe5hlFeoWIrF+Ixok4NCx tGw6p2EuXRTnmBdEG5VCQHNIDyslTBIBGWg89/Y56EzvOM7dvlHNcTnrT5SpZC0fPMi2k/Wj0t7 /ECja5Oy4DSw8LLmIEtd6I7N5MbE0F8aVsZTYpytuVLeC3dWs/vLLnPv/4CnZ+6V3cFw== X-Received: by 2002:a5d:5f52:0:b0:482:ea2b:c598 with SMTP id ffacd0b85a97d-48488dece54mr6202124f8f.6.1788345709018; Wed, 02 Sep 2026 03:41:49 -0700 (PDT) Received: from deb05.proceq.com ([213.160.61.66]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72df2sm5998947f8f.1.2026.09.02.03.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 03:41:48 -0700 (PDT) From: Mehmet Fide To: Ping-Ke Shih Cc: Bitterblue Smith , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Mehmet Fide Subject: [PATCH rtw-next 1/2] wifi: rtw88: usb: bound what the driver feeds the after-DTIM queue Date: Wed, 2 Sep 2026 12:41:45 +0200 Message-ID: <20260902104146.3853102-2-mehmet.fide@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260902104146.3853102-1-mehmet.fide@gmail.com> References: <20260902104146.3853102-1-mehmet.fide@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mehmet Fide Frames routed to the high queue are transmitted right after DTIM beacons only, inside the ATIM window, while they wait in the shared TX page pool. The driver puts no limit on how many it hands over, so as long as one station dozes, any sustained broadcast or multicast traffic outruns the drain and empties the pool: measured on an RTL8822BU AP with a single client in power save and ~40 frames/s of mDNS chatter, the free page count at 0x240 goes from 1803 to 16 in about 100 seconds and stays there for as long as the traffic lasts. From that point every other transmit queues behind the backlog, authentication responses arrive too late for anyone to join, and the reserved page download fails ("error beacon valid"). The AP keeps beaconing and only a reboot recovers. Feed the high queue through a small token bucket set below the measured drain rate (about 3 frames per DTIM, ~15/s at dtim_period 2 on the default 2 TU ATIM window); whatever exceeds the budget leaves on its access category queue right away. The high queue backlog is now bounded by the burst size under any load, so the page pool cannot run dry, at the price that a dozing station may miss part of a broadcast storm. Signed-off-by: Mehmet Fide --- drivers/net/wireless/realtek/rtw88/usb.c | 42 ++++++++++++++++++++++-- drivers/net/wireless/realtek/rtw88/usb.h | 5 +++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireles= s/realtek/rtw88/usb.c index c90802919473..80965e5ea778 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -562,7 +562,38 @@ static int rtw_usb_write_data_h2c(struct rtw_dev *rtwd= ev, u8 *buf, u32 size) return rtw_usb_write_data(rtwdev, &pkt_info, buf); } =20 -static u8 rtw_usb_tx_queue_mapping_to_qsel(struct sk_buff *skb) +#define RTW_USB_HIQ_RATE 10 +#define RTW_USB_HIQ_BURST 16 + +static bool rtw_usb_hiq_take(struct rtw_usb *rtwusb) +{ + unsigned long flags, delta; + bool ok; + u32 add; + + spin_lock_irqsave(&rtwusb->hiq_lock, flags); + delta =3D jiffies - rtwusb->hiq_refill; + if (delta >=3D HZ / RTW_USB_HIQ_RATE) { + add =3D delta / (HZ / RTW_USB_HIQ_RATE); + if (add >=3D RTW_USB_HIQ_BURST) { + rtwusb->hiq_tokens =3D RTW_USB_HIQ_BURST; + rtwusb->hiq_refill =3D jiffies; + } else { + rtwusb->hiq_tokens =3D min_t(u32, rtwusb->hiq_tokens + add, + RTW_USB_HIQ_BURST); + rtwusb->hiq_refill +=3D add * (HZ / RTW_USB_HIQ_RATE); + } + } + ok =3D rtwusb->hiq_tokens > 0; + if (ok) + rtwusb->hiq_tokens--; + spin_unlock_irqrestore(&rtwusb->hiq_lock, flags); + + return ok; +} + +static u8 rtw_usb_tx_queue_mapping_to_qsel(struct rtw_usb *rtwusb, + struct sk_buff *skb) { struct ieee80211_hdr *hdr =3D (struct ieee80211_hdr *)skb->data; struct ieee80211_tx_info *info =3D IEEE80211_SKB_CB(skb); @@ -573,7 +604,8 @@ static u8 rtw_usb_tx_queue_mapping_to_qsel(struct sk_bu= ff *skb) qsel =3D TX_DESC_QSEL_MGMT; else if (is_broadcast_ether_addr(hdr->addr1) || is_multicast_ether_addr(hdr->addr1)) - qsel =3D (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) ? + qsel =3D (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) && + rtw_usb_hiq_take(rtwusb) ? TX_DESC_QSEL_HIGH : skb->priority; else if (skb_get_queue_mapping(skb) <=3D IEEE80211_AC_BK) qsel =3D skb->priority; @@ -593,7 +625,7 @@ static int rtw_usb_tx_write(struct rtw_dev *rtwdev, u8 *pkt_desc; int ep; =20 - pkt_info->qsel =3D rtw_usb_tx_queue_mapping_to_qsel(skb); + pkt_info->qsel =3D rtw_usb_tx_queue_mapping_to_qsel(rtwusb, skb); pkt_desc =3D skb_push(skb, chip->tx_pkt_desc_sz); memset(pkt_desc, 0, chip->tx_pkt_desc_sz); ep =3D qsel_to_ep(rtwusb, pkt_info->qsel); @@ -1034,6 +1066,10 @@ static int rtw_usb_init_tx(struct rtw_dev *rtwdev) struct rtw_usb *rtwusb =3D rtw_get_usb_priv(rtwdev); int i; =20 + spin_lock_init(&rtwusb->hiq_lock); + rtwusb->hiq_tokens =3D RTW_USB_HIQ_BURST; + rtwusb->hiq_refill =3D jiffies; + rtwusb->txwq =3D create_singlethread_workqueue("rtw88_usb: tx wq"); if (!rtwusb->txwq) { rtw_err(rtwdev, "failed to create TX work queue\n"); diff --git a/drivers/net/wireless/realtek/rtw88/usb.h b/drivers/net/wireles= s/realtek/rtw88/usb.h index 9b695b688b24..67463a4d2f90 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.h +++ b/drivers/net/wireless/realtek/rtw88/usb.h @@ -75,6 +75,11 @@ struct rtw_usb { u8 out_ep[RTW_USB_EP_MAX]; int qsel_to_ep[TX_DESC_QSEL_MAX]; =20 + /* protects hiq_tokens and hiq_refill */ + spinlock_t hiq_lock; + u32 hiq_tokens; + unsigned long hiq_refill; + struct workqueue_struct *txwq, *rxwq; =20 struct sk_buff_head tx_queue[RTW_USB_EP_MAX]; --=20 2.54.0 From nobody Sat Sep 26 10:02:05 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D62E8325726 for ; Wed, 2 Sep 2026 10:41:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788345716; cv=none; b=h6kjlMRV8a+f12GoFXNTn3FZqbs9WMCF0YJifoBee+ud08jT8RnpiOQXH3e6BjyiF78nzKf67muHSIMD1ale6rhK9pehcwilztu/6sYUXhF44VH+WNO9qYPhkz0QMItKY6yorG8011TFluu7+XwhjHzCX0MlFxiyYnkrHBD/qfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788345716; c=relaxed/simple; bh=BM4UT3u7PBt1754sfAEsrFjRExntkck5ge2S0m6jB7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nmcs30sXMf3s0IAF+slhKdFQhiSwKV2TOQFA7t9761FYaQrpySWl4cX+NEFPvnqgpFwDj4DdMR9HzQi9flHH1JPkxa8j5BC3RVnKmlvPqGcx2awlcQ1Isv/QudMoGYW3Y73zs1PuYhOFeCNtlg/QCTe2o7riyqDhL+JCUDSm2AE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qPBdRGKf; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qPBdRGKf" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-48436216a98so579513f8f.0 for ; Wed, 02 Sep 2026 03:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788345710; x=1788950510; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=umCfMh2mdI5/NHdu5isq5L/FcWDog22dq3L2ilcBjkQ=; b=qPBdRGKfkegEP0VSFNC+ZTi9COFZffAyd8k6jbvJAJKRm2xLlHsE6DFtxCM4eZJkxD mq7U7DZa46kgvNJgLXkOPqaaS9SUlG8Jrc7CTeWee9PZ4yG8/Rq4tcJg3YlRRFw7B1HJ piu/dryhDSo7HEU7k7Dxkj605yjkJ4nnGKXI4LPDZ2nbveWBSh8zzr1hgctVeeLnMfqO Idtmk/nkyVCz9DmEWyFI6yib5HmMaDJC86jXYWR/XuiSzSRK6eOJudwF0q8a0pRo8SBo P6EcO3eblchVdVKpbnb89lkHorfB16US7ukCy/sI+9uKarqYswifE2Os9YRJdB+dqez1 dL2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788345710; x=1788950510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=umCfMh2mdI5/NHdu5isq5L/FcWDog22dq3L2ilcBjkQ=; b=SQQ22yUp6sbJC2feiAullhs580FvdfzuWfbcdFwJ7ZpbnMDI+cIrKE8qqZX8/xCmLO djX7IRRbggsOV1QP1iMZ6pto43G/MSANy4vovRydOu2wqyiTz6BRSgoaYISn2VwyuZuf EyMyrK7COHyvnE6/2aIipWaXzcep3wpwYccZKCnyHIudAK826slrkcfsRUNjZUnLRX51 3jIfcz+MS+zIkqWZgEhdQNOtZ58sosyCsavFeqFHmB/S8FFkZEqiG34BzK1GxF2ZoLW+ 7ddtm/GFegvNlbn/Tebm//OiFEV9ghqeav4fUon+97SH+rxoMyk8A6Nr4UtZJbYQkXai qYfw== X-Forwarded-Encrypted: i=1; AKwUvBzNhEOU336pGhcdGB5n/WTmR3QCGqHWGkR+jgU8krya+K0nEa7TDHgGQB/vVyQ5TH0HqpNPOQmb+q/4eY0=@vger.kernel.org X-Gm-Message-State: AFuF++lMUzdnmfSMSG8bTYksEPkhA9wac4gPNxUuVi8KwGaFeR3v73yZ nczCljQx5TskK3fLQJVcwfP9eFmt8Gpq3DBxeNYPGra3/Q/smgUKnMi5 X-Gm-Gg: AYBFou0Nb8qtklQLtQYY1yty15QhYQoEl59qKGxgNyI3jmC0ZAZjA83pp+yhuDA+CEP Vc2O676A7uXjT/y104FmFJQ99F2nZA6IwyevLW4gBfdNsvw+jSVgOvhdPiwkwUlKNtEAUhkh+n3 v7OumYwVFOfUnT6vl8J9x3oCfbfecpCmPI9vlgRLr2MRHX4EhzAfpc4ZFXIhZLhHkgEt7nRn1qt Y0e2cRyYjbXO3nogYgTWfUZ2GHjipiIpcTu1TCMpL7K6qX3gliKoDQG+J+ie489kA5BbhjmDaGm J7pBfxqcMNcbnYD20rggETegnC1S1KqsC2DmEDg1bCqWhUf++uwFHwuoPnL5G9VTATcWISwwtbo sSNBxrSCcjKKF/DYwbE/tbvTw3vRHE3F38BKblItcf1bYEM7ZH8PRp+9ONO1XdMKY4VQKwtUp3J fNVfRIucFKYKF9YGQRy4EFxnRP6pU+4CfWq2k5F4mwYAcJty9wgtB4kNtvEDl1O2fyK1mf7imRn GgTyQ== X-Received: by 2002:a5d:5d88:0:b0:482:9dc6:16c4 with SMTP id ffacd0b85a97d-48488efe615mr7477305f8f.1.1788345709797; Wed, 02 Sep 2026 03:41:49 -0700 (PDT) Received: from deb05.proceq.com ([213.160.61.66]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48448e72df2sm5998947f8f.1.2026.09.02.03.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 03:41:49 -0700 (PDT) From: Mehmet Fide To: Ping-Ke Shih Cc: Bitterblue Smith , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Mehmet Fide Subject: [PATCH rtw-next 2/2] wifi: rtw88: usb: only let the frames a dozing station needs use the after-DTIM queue Date: Wed, 2 Sep 2026 12:41:46 +0200 Message-ID: <20260902104146.3853102-3-mehmet.fide@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260902104146.3853102-1-mehmet.fide@gmail.com> References: <20260902104146.3853102-1-mehmet.fide@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mehmet Fide With the budget in place the high queue can no longer take the chip down, but ordinary chatter still competes with the frames a sleeping station actually needs. mac80211 marks every broadcast and multicast frame with IEEE80211_TX_CTL_SEND_AFTER_DTIM while a station dozes, mDNS and SSDP included, so under normal traffic the budget is spent on frames nobody waits for. Do what the vendor driver does with its default "allow special" high queue filter: admit only ARP, EAPOL and DHCP to the after-DTIM path, the frames a station coming out of power save has to see; everything else goes out on its access category queue at line rate. Encrypted group frames carry the IV between the header and the SNAP header, so the parser accounts for hw_key->iv_len. With the filter in place the page pool stays at 1803 through the same 180 second storm, a DHCP flood still takes the after-DTIM path (and is then held by the budget), and join/ping cycling without power save is unchanged (10/10). Signed-off-by: Mehmet Fide --- drivers/net/wireless/realtek/rtw88/usb.c | 42 +++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireles= s/realtek/rtw88/usb.c index 80965e5ea778..dd65b304b2c7 100644 --- a/drivers/net/wireless/realtek/rtw88/usb.c +++ b/drivers/net/wireless/realtek/rtw88/usb.c @@ -5,6 +5,9 @@ #include #include #include +#include +#include +#include #include "main.h" #include "debug.h" #include "mac.h" @@ -562,6 +565,43 @@ static int rtw_usb_write_data_h2c(struct rtw_dev *rtwd= ev, u8 *buf, u32 size) return rtw_usb_write_data(rtwdev, &pkt_info, buf); } =20 +static bool rtw_usb_bmc_needs_dtim(struct sk_buff *skb) +{ + struct ieee80211_tx_info *info =3D IEEE80211_SKB_CB(skb); + struct ieee80211_hdr *hdr =3D (struct ieee80211_hdr *)skb->data; + unsigned int hdrlen =3D ieee80211_hdrlen(hdr->frame_control); + unsigned int paylen =3D sizeof(rfc1042_header) + sizeof(__be16); + const struct udphdr *udp; + const struct iphdr *ip; + const u8 *snap; + __be16 proto; + + if (info->control.hw_key) + hdrlen +=3D info->control.hw_key->iv_len; + + if (skb->len < hdrlen + paylen) + return false; + + snap =3D skb->data + hdrlen; + proto =3D get_unaligned((__be16 *)(snap + sizeof(rfc1042_header))); + + if (proto =3D=3D htons(ETH_P_ARP) || proto =3D=3D htons(ETH_P_PAE)) + return true; + + if (proto !=3D htons(ETH_P_IP) || skb->len < hdrlen + paylen + sizeof(*ip= )) + return false; + + ip =3D (const struct iphdr *)(snap + paylen); + if (ip->protocol !=3D IPPROTO_UDP) + return false; + + udp =3D (const struct udphdr *)((const u8 *)ip + ip->ihl * 4); + if (skb->len < (unsigned int)((const u8 *)udp - skb->data) + sizeof(*udp)) + return false; + + return udp->dest =3D=3D htons(67) || udp->dest =3D=3D htons(68); +} + #define RTW_USB_HIQ_RATE 10 #define RTW_USB_HIQ_BURST 16 =20 @@ -605,7 +645,7 @@ static u8 rtw_usb_tx_queue_mapping_to_qsel(struct rtw_u= sb *rtwusb, else if (is_broadcast_ether_addr(hdr->addr1) || is_multicast_ether_addr(hdr->addr1)) qsel =3D (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) && - rtw_usb_hiq_take(rtwusb) ? + rtw_usb_bmc_needs_dtim(skb) && rtw_usb_hiq_take(rtwusb) ? TX_DESC_QSEL_HIGH : skb->priority; else if (skb_get_queue_mapping(skb) <=3D IEEE80211_AC_BK) qsel =3D skb->priority; --=20 2.54.0