Commit b4f85443 authored May 30, 2022 by Johannes Berg

wifi: mac80211: make channel context code MLO-aware



Make the channel context code MLO aware, along with some
functions that it uses, so that the chan.c file is now
MLD-clean and no longer uses deflink/bss_conf/etc.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 7fc83a2b

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -8919,6 +8919,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_chanctx_conf *ctx)
		{
		struct ath10k *ar = hw->priv;
		@@ -8998,6 +8999,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_chanctx_conf *ctx)
		{
		struct ath10k *ar = hw->priv;

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -7072,6 +7072,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_chanctx_conf *ctx)
		{
		struct ath11k *ar = hw->priv;
		@@ -7161,6 +7162,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_chanctx_conf *ctx)
		{
		struct ath11k *ar = hw->priv;

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2596,6 +2596,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_chanctx_conf *conf)
		{
		struct ath_softc *sc = hw->priv;
		@@ -2627,6 +2628,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_chanctx_conf *conf)
		{
		struct ath_softc *sc = hw->priv;

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -4235,6 +4235,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_chanctx_conf *ctx)
		{
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
		@@ -4308,6 +4309,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_chanctx_conf *ctx)
		{
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

drivers/net/wireless/mac80211_hwsim.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2722,6 +2722,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_chanctx_conf *ctx)
		{
		hwsim_check_magic(vif);
		@@ -2732,6 +2733,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_chanctx_conf *ctx)
		{
		hwsim_check_magic(vif);