Commit 3e75668b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: prefer RCU_INIT_POINTER() 



For constant values we don't need rcu_assign_pointer(),
use RCU_INIT_POINTER() instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230418122405.7b400d21a27f.Iccdef9d777677390a9881c88b06c0ed13a83d978@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 457d7fb0

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -3314,7 +3314,7 @@ void iwl_mvm_sta_pre_rcu_remove(struct ieee80211_hw *hw, 
						     lockdep_is_held(&mvm->mutex));

		sta_id = link_sta->sta_id;

		if (sta == rcu_access_pointer(mvm->fw_id_to_mac_id[sta_id])) {

			rcu_assign_pointer(mvm->fw_id_to_mac_id[sta_id],

			RCU_INIT_POINTER(mvm->fw_id_to_mac_id[sta_id],

					 ERR_PTR(-ENOENT));

			RCU_INIT_POINTER(mvm->fw_id_to_link_sta[sta_id], NULL);

		}

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -2152,7 +2152,7 @@ int iwl_mvm_allocate_int_sta(struct iwl_mvm *mvm, 
	sta->type = type;



	/* put a non-NULL value so iterating over the stations won't stop */

	rcu_assign_pointer(mvm->fw_id_to_mac_id[sta->sta_id], ERR_PTR(-EINVAL));

	RCU_INIT_POINTER(mvm->fw_id_to_mac_id[sta->sta_id], ERR_PTR(-EINVAL));

	return 0;

}