From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 28 Apr 2026 09:25:35 +0000 (+0200)
Subject: wifi: mac80211: remove NPCA during chandef downgrade
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=8d66c383ed6c1ec9cdffb77dbd4fc350b6c41efb;p=thirdparty%2Flinux.git

wifi: mac80211: remove NPCA during chandef downgrade

We can't use NPCA any more if the chandef was downgraded,
for obvious reasons. Clear NPCA during any downgrade.

Link: https://patch.msgid.link/20260428112708.2ab0e6f2e433.Ic39badb6782ef2242942424538f57e4a83391a06@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 00e46b5bc020..24537794256c 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3832,6 +3832,10 @@ again:
 		c->width = new_primary_width;
 	}
 
+	/* whatever we do, downgrading removes NPCA */
+	c->npca_chan = NULL;
+	c->npca_punctured = 0;
+
 	/*
 	 * With an 80 MHz channel, we might have the puncturing in the primary
 	 * 40 Mhz channel, but that's not valid when downgraded to 40 MHz width.