From: Johannes Berg Date: Wed, 1 Mar 2023 10:09:31 +0000 (+0200) Subject: wifi: mac80211: simplify reasoning about EHT capa handling X-Git-Tag: v6.4-rc1~132^2~336^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8edb34640eeeefc74a3d767b61b4d4ac3b94eea;p=thirdparty%2Fkernel%2Flinux.git wifi: mac80211: simplify reasoning about EHT capa handling Given the code in cfg80211, EHT capa cannot be non-NULL when HE capa is NULL, but it's easier to reason about it if both are checked and the compiler will likely integrate the check with the previous one for HE capa anyway. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230301115906.7413d50d23bc.I6fef7484721be9bd5364f64921fc5e9168495f62@changeid Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 7e90f4a81962c..2c8fa19c2f248 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1788,7 +1788,7 @@ static int sta_link_apply_parameters(struct ieee80211_local *local, (void *)params->he_6ghz_capa, link_sta); - if (params->eht_capa) + if (params->he_capa && params->eht_capa) ieee80211_eht_cap_ie_to_sta_eht_cap(sdata, sband, (u8 *)params->he_capa, params->he_capa_len,