aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mac80211.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index c7a73c68bdab..e16c29dc9d49 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -857,9 +857,8 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw)
857 return ret; 857 return ret;
858} 858}
859 859
860static void iwl_mvm_mac_restart_complete(struct ieee80211_hw *hw) 860static void iwl_mvm_restart_complete(struct iwl_mvm *mvm)
861{ 861{
862 struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
863 int ret; 862 int ret;
864 863
865 mutex_lock(&mvm->mutex); 864 mutex_lock(&mvm->mutex);
@@ -877,6 +876,21 @@ static void iwl_mvm_mac_restart_complete(struct ieee80211_hw *hw)
877 mutex_unlock(&mvm->mutex); 876 mutex_unlock(&mvm->mutex);
878} 877}
879 878
879static void
880iwl_mvm_mac_reconfig_complete(struct ieee80211_hw *hw,
881 enum ieee80211_reconfig_type reconfig_type)
882{
883 struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
884
885 switch (reconfig_type) {
886 case IEEE80211_RECONFIG_TYPE_RESTART:
887 iwl_mvm_restart_complete(mvm);
888 break;
889 case IEEE80211_RECONFIG_TYPE_SUSPEND:
890 break;
891 }
892}
893
880void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 894void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
881{ 895{
882 lockdep_assert_held(&mvm->mutex); 896 lockdep_assert_held(&mvm->mutex);
@@ -3014,7 +3028,7 @@ const struct ieee80211_ops iwl_mvm_hw_ops = {
3014 .tx = iwl_mvm_mac_tx, 3028 .tx = iwl_mvm_mac_tx,
3015 .ampdu_action = iwl_mvm_mac_ampdu_action, 3029 .ampdu_action = iwl_mvm_mac_ampdu_action,
3016 .start = iwl_mvm_mac_start, 3030 .start = iwl_mvm_mac_start,
3017 .restart_complete = iwl_mvm_mac_restart_complete, 3031 .reconfig_complete = iwl_mvm_mac_reconfig_complete,
3018 .stop = iwl_mvm_mac_stop, 3032 .stop = iwl_mvm_mac_stop,
3019 .add_interface = iwl_mvm_mac_add_interface, 3033 .add_interface = iwl_mvm_mac_add_interface,
3020 .remove_interface = iwl_mvm_mac_remove_interface, 3034 .remove_interface = iwl_mvm_mac_remove_interface,