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