wifi: cfg80211: include s1g_primary_2mhz when comparing chandefs

donnaskiez · jmberg-intel · commit cba1ba11c1ba · 2025-11-25T10:31:28.000+01:00
When comparing chandefs, ensure we include s1g_primary_2mhz. Signed-off-by: Lachlan Hodges <lachlan.hodges@morsemicro.com> Link: https://patch.msgid.link/20251125025927.245280-3-lachlan.hodges@morsemicro.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
@@ -974,7 +974,8 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,
 		chandef1->center_freq1 == chandef2->center_freq1 &&
 		chandef1->freq1_offset == chandef2->freq1_offset &&
 		chandef1->center_freq2 == chandef2->center_freq2 &&
-		chandef1->punctured == chandef2->punctured);
+		chandef1->punctured == chandef2->punctured &&
+		chandef1->s1g_primary_2mhz == chandef2->s1g_primary_2mhz);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -974,7 +974,8 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,`
`974`	`974`	`chandef1->center_freq1 == chandef2->center_freq1 &&`
`975`	`975`	`chandef1->freq1_offset == chandef2->freq1_offset &&`
`976`	`976`	`chandef1->center_freq2 == chandef2->center_freq2 &&`
`977`		`- chandef1->punctured == chandef2->punctured);`
	`977`	`+ chandef1->punctured == chandef2->punctured &&`
	`978`	`+ chandef1->s1g_primary_2mhz == chandef2->s1g_primary_2mhz);`
`978`	`979`	`}`
`979`	`980`
`980`	`981`	`/**`