Commit 727eff4d authored Jul 03, 2022 by Gregory Greenman Committed by Johannes Berg Jul 15, 2022

wifi: mac80211: replace link_id with link_conf in switch/(un)assign_vif_chanctx()



Since mac80211 already has a protected pointer to link_conf,
pass it to the driver to avoid additional RCU locking.

Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent fa2ca639

drivers/net/wireless/ath/ath10k/mac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -8920,7 +8920,7 @@ ath10k_mac_op_change_chanctx(struct ieee80211_hw *hw,
		static int
		ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct ath10k *ar = hw->priv;
		@@ -9000,7 +9000,7 @@ ath10k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
		static void
		ath10k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct ath10k *ar = hw->priv;

drivers/net/wireless/ath/ath11k/mac.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7073,7 +7073,7 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,
		static int
		ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct ath11k *ar = hw->priv;
		@@ -7163,7 +7163,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
		static void
		ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct ath11k *ar = hw->priv;

drivers/net/wireless/ath/ath9k/main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2597,7 +2597,7 @@ static void ath9k_change_chanctx(struct ieee80211_hw *hw,

		static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *conf)
		{
		struct ath_softc *sc = hw->priv;
		@@ -2629,7 +2629,7 @@ static int ath9k_assign_vif_chanctx(struct ieee80211_hw *hw,

		static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *conf)
		{
		struct ath_softc *sc = hw->priv;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -4264,7 +4264,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
		}
		static int iwl_mvm_assign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
		@@ -4338,7 +4338,7 @@ static void __iwl_mvm_unassign_vif_chanctx(struct iwl_mvm *mvm,

		static void iwl_mvm_unassign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

drivers/net/wireless/mac80211_hwsim.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2794,7 +2794,7 @@ static void mac80211_hwsim_change_chanctx(struct ieee80211_hw *hw,

		static int mac80211_hwsim_assign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		hwsim_check_magic(vif);
		@@ -2805,7 +2805,7 @@ static int mac80211_hwsim_assign_vif_chanctx(struct ieee80211_hw *hw,

		static void mac80211_hwsim_unassign_vif_chanctx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		unsigned int link_id,
		struct ieee80211_bss_conf *link_conf,
		struct ieee80211_chanctx_conf *ctx)
		{
		hwsim_check_magic(vif);