Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5db4c4b9 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: pass the vif to cancel_remain_on_channel 



This low level driver can find it useful to get the vif
when a remain on channel session is cancelled.

iwlwifi will need this soon.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://lore.kernel.org/r/20190723180001.5828-1-emmanuel.grumbach@intel.com


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

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

+2 −1
Original line number Diff line number Diff line
@@ -6970,7 +6970,8 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 
	return ret;

}



static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw)

static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw,

					   struct ieee80211_vif *vif)

{

	struct ath10k *ar = hw->priv;

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

+2 −1
Original line number Diff line number Diff line
@@ -2392,7 +2392,8 @@ static int ath9k_remain_on_channel(struct ieee80211_hw *hw, 
	return ret;

}



static int ath9k_cancel_remain_on_channel(struct ieee80211_hw *hw)

static int ath9k_cancel_remain_on_channel(struct ieee80211_hw *hw,

					  struct ieee80211_vif *vif)

{

	struct ath_softc *sc = hw->priv;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

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

+2 −1
Original line number Diff line number Diff line
@@ -4010,7 +4010,8 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw, 
	return ret;

}



static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw)

static int iwl_mvm_cancel_roc(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

drivers/net/wireless/mac80211_hwsim.c

+2 −1
Original line number Diff line number Diff line
@@ -2216,7 +2216,8 @@ static int mac80211_hwsim_roc(struct ieee80211_hw *hw, 
	return 0;

}



static int mac80211_hwsim_croc(struct ieee80211_hw *hw)

static int mac80211_hwsim_croc(struct ieee80211_hw *hw,

			       struct ieee80211_vif *vif)

{

	struct mac80211_hwsim_data *hwsim = hw->priv;

drivers/net/wireless/rsi/rsi_91x_mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,8 @@ static int rsi_mac80211_roc(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	return status;

}



static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw)

static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif)

{

	struct rsi_hw *adapter = hw->priv;

	struct rsi_common *common = adapter->priv;