From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 739AD37C0F6; Wed, 30 Sep 2026 16:00:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784026; cv=none; b=Ff8A0TU3ptCj1mvUFH9lr4+b8LA2yJOHkmmBixmsHGVlvNbIHpXtfGVVDOjPxCwVIs+WmnYhKvpHHJZVT/tY6gwmuLAX5n2R1hgh7FjPKZ+Annyth6/J3R5KqKQFUJxhfqWj7Dnc7aYwty2X8DzZuU3FSBvLacM5euJN8ulmHd8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784026; c=relaxed/simple; bh=SbsSty0gOj9H3QpA1tWtRwonmkBPwM2M+C2gd0GatYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M0uKOw+nyOPFJAxj5yj6dz0W8NcZaZM8tY2oVZVDGUCuB0a2ozGQB3KQFnbDuW6AvRPTU8LHk5b7zhTAdroz+nOSpCJkQ+y0UX1Vf2lSXzhrf/+Az2Z/b/TzwP90R2+Z4kbHjuRaBo9ilcWVV2yKINZa5MJbs3gxcd+uVXa+Gu8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Erbp6FfQ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Erbp6FfQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FCBF1F00898; Wed, 30 Sep 2026 16:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790784022; bh=lHSgNWaPu8a8cl0whb+zUAyoMM7hSaxpBbdvMyvQqso=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Erbp6FfQvXly+bvFIJxCzF8Z8lKBxdFKzkiUTh3Ams+bKF6wVMv1LVjTj6+ehYvmR 0cJOMaTCiC77uxptq433sPoKd7caEJNPM8uPiTx3iixkKxi4ynvLQ4GGyqQTN8o+Y3 r2t+3sTeX/wvz1nxdHCCiqj8IUE/zh4l65CWusGM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jouni Malinen , Johannes Berg , Sasha Levin Subject: [PATCH 6.1 010/982] wifi: mac80211: always allow transmitting null-data on TXQs Date: Wed, 30 Sep 2026 17:12:26 +0200 Message-ID: <20260930152417.008984175@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit 51129a2ca0482b006d0e12a0aa025ff1e1cad2cb ] Jouni reported that certain sequences of tests caused some WDS tests to fail after applying the upcoming hwsim changes for NAN. I bisected that down to converting hwsim to TXQs, and after a long debug session found that the 4-addr NDP was getting dropped, because it goes out via a (management) TXQ and is a data frame. It's unclear to me now why this only happens in some test sequences (e.g. "sigma_dut_sae_h2e_ap_loop ap_wds_sta" and "sigma_dut_eap_ttls_all_akm_suites ap_wds_sta_open"), maybe that affects timing and the frame is otherwise delayed in some way. Correct the check to only drop frames that actually carry data, not NDPs. Reported-by: Jouni Malinen Link: https://patch.msgid.link/20260417141601.851ddf4adb59.I3d668c0e1bdca9cd98f2fc46f84a066e68cc7a62@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 31f000aa22309..0cd02bd3fae30 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3805,7 +3805,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, * injected frames or EAPOL frames from the local station. */ if (unlikely(!(info->flags & IEEE80211_TX_CTL_INJECTED) && - ieee80211_is_data(hdr->frame_control) && + ieee80211_is_data_present(hdr->frame_control) && !ieee80211_vif_is_mesh(&tx.sdata->vif) && tx.sdata->vif.type != NL80211_IFTYPE_OCB && !is_multicast_ether_addr(hdr->addr1) && -- 2.53.0