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 <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230301115906.7413d50d23bc.I6fef7484721be9bd5364f64921fc5e9168495f62@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7e90f4a81962c1e8b47df0cd8cf5af4ef1ade113..2c8fa19c2f248955891b5ef4a2f02d30d7437297 100644 (file)
--- 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,