diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-10-18 15:18:34 +0000 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-10-23 17:33:47 +0200 |
| commit | cadae7ead4434d6c4ca15fb74cc729fb868fcca3 (patch) | |
| tree | 88754b3261f7c7c708c55a1d4e58781d82d0621d /drivers/net/wireless/intel/iwlwifi/mvm/sta.c | |
| parent | 188a1bf894323bf3a90361676da8364c82ce6d32 (diff) | |
| download | linux-cadae7ead4434d6c4ca15fb74cc729fb868fcca3.tar.gz linux-cadae7ead4434d6c4ca15fb74cc729fb868fcca3.tar.bz2 linux-cadae7ead4434d6c4ca15fb74cc729fb868fcca3.zip | |
wifi: iwlwifi: work around -Wenum-compare-conditional warning
This is one of only three -Wenum-compare-conditional warnings we get
in randconfig builds:
drivers/net/wireless/intel/iwlwifi/mvm/sta.c:4331:17: error: conditional expression between different enumeration types ('enum iwl_fw_sta_type' and 'enum iwl_sta_type') [-Werror,-Wenum-compare-conditional]
4331 | u32 type = mld ? STATION_TYPE_PEER : IWL_STA_LINK;
| ^ ~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~
This is a false positive since the code works as intended, but the
warning is otherwise sensible, so slightly rewrite it in order to
not trigger the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20241018151841.3821671-1-arnd@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index b6c99cd6d9e5..9d05c344d967 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -4328,7 +4328,10 @@ int iwl_mvm_add_pasn_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif, unsigned int wdg_timeout = iwl_mvm_get_wd_timeout(mvm, vif); bool mld = iwl_mvm_has_mld_api(mvm->fw); - u32 type = mld ? STATION_TYPE_PEER : IWL_STA_LINK; + u32 type = IWL_STA_LINK; + + if (mld) + type = STATION_TYPE_PEER; ret = iwl_mvm_allocate_int_sta(mvm, sta, 0, NL80211_IFTYPE_UNSPECIFIED, type); |