You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.9 KiB
53 lines
1.9 KiB
From 809ebadf870b7291ce9d0e80d5fb4bbba9c83e2a Mon Sep 17 00:00:00 2001
|
|
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
Date: Fri, 6 Sep 2019 01:45:07 +0200
|
|
Subject: [PATCH 6/6] Revert "iwlwifi: mvm: implement CSA abort"
|
|
|
|
This reverts commit 792211266379ea6885d97c55b8d73e1bfecb7d54.
|
|
---
|
|
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 24 -----------------------
|
|
1 file changed, 24 deletions(-)
|
|
|
|
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
===================================================================
|
|
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:45:49.834796085 +0200
|
|
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:45:50.011793806 +0200
|
|
@@ -4167,29 +4167,6 @@
|
|
return ret;
|
|
}
|
|
|
|
-static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,
|
|
- struct ieee80211_vif *vif)
|
|
-{
|
|
- struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
|
|
- struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
|
|
- struct iwl_chan_switch_te_cmd cmd = {
|
|
- .mac_id = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,
|
|
- mvmvif->color)),
|
|
- .action = cpu_to_le32(FW_CTXT_ACTION_REMOVE),
|
|
- };
|
|
-
|
|
- IWL_DEBUG_MAC80211(mvm, "Abort CSA on mac %d\n", mvmvif->id);
|
|
-
|
|
- mutex_lock(&mvm->mutex);
|
|
- WARN_ON(iwl_mvm_send_cmd_pdu(mvm,
|
|
- WIDE_ID(MAC_CONF_GROUP,
|
|
- CHANNEL_SWITCH_TIME_EVENT_CMD),
|
|
- 0, sizeof(cmd), &cmd));
|
|
- mutex_unlock(&mvm->mutex);
|
|
-
|
|
- WARN_ON(iwl_mvm_post_channel_switch(hw, vif));
|
|
-}
|
|
-
|
|
static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop)
|
|
{
|
|
int i;
|
|
@@ -4565,7 +4542,6 @@
|
|
.channel_switch = iwl_mvm_channel_switch,
|
|
.pre_channel_switch = iwl_mvm_pre_channel_switch,
|
|
.post_channel_switch = iwl_mvm_post_channel_switch,
|
|
- .abort_channel_switch = iwl_mvm_abort_channel_switch,
|
|
|
|
.tdls_channel_switch = iwl_mvm_tdls_channel_switch,
|
|
.tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,
|