|
 |
deb259 |
From 1cc8caa4a0763344aaed1b7cbefd5f7e999db91b Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Fri, 6 Sep 2019 01:44:58 +0200
|
|
|
deb259 |
Subject: [PATCH 5/6] Revert "iwlwifi: mvm: track CSA beacons"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit c37763d22d07049cc13a088d8622d25d2a7d48de.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 --
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 29 ++---------------------
|
|
|
deb259 |
2 files changed, 2 insertions(+), 29 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/fw/file.h
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/fw/file.h 2019-09-06 01:36:11.332244171 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/fw/file.h 2019-09-06 01:45:49.833796098 +0200
|
|
|
deb259 |
@@ -363,7 +363,6 @@
|
|
|
deb259 |
* IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD: firmware supports CSA command
|
|
|
deb259 |
* @IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS: firmware supports ultra high band
|
|
|
deb259 |
* (6 GHz).
|
|
|
deb259 |
- * @IWL_UCODE_TLV_CAPA_CS_MODIFY: firmware supports modify action CSA command
|
|
|
deb259 |
* @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement
|
|
|
deb259 |
* @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts
|
|
|
deb259 |
* @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT
|
|
|
deb259 |
@@ -429,7 +428,6 @@
|
|
|
deb259 |
IWL_UCODE_TLV_CAPA_CHANNEL_SWITCH_CMD = (__force iwl_ucode_tlv_capa_t)46,
|
|
|
deb259 |
IWL_UCODE_TLV_CAPA_ULTRA_HB_CHANNELS = (__force iwl_ucode_tlv_capa_t)48,
|
|
|
deb259 |
IWL_UCODE_TLV_CAPA_FTM_CALIBRATED = (__force iwl_ucode_tlv_capa_t)47,
|
|
|
deb259 |
- IWL_UCODE_TLV_CAPA_CS_MODIFY = (__force iwl_ucode_tlv_capa_t)49,
|
|
|
deb259 |
|
|
|
deb259 |
/* set 2 */
|
|
|
deb259 |
IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE = (__force iwl_ucode_tlv_capa_t)64,
|
|
|
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.666798248 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:45:49.834796085 +0200
|
|
|
deb259 |
@@ -8,7 +8,7 @@
|
|
|
deb259 |
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
|
|
|
deb259 |
* Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
|
|
|
deb259 |
* Copyright(c) 2016 - 2017 Intel Deutschland GmbH
|
|
|
deb259 |
- * Copyright(c) 2018 - 2019 Intel Corporation
|
|
|
deb259 |
+ * Copyright(c) 2018 Intel Corporation
|
|
|
deb259 |
*
|
|
|
deb259 |
* This program is free software; you can redistribute it and/or modify
|
|
|
deb259 |
* it under the terms of version 2 of the GNU General Public License as
|
|
|
deb259 |
@@ -31,6 +31,7 @@
|
|
|
deb259 |
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
|
|
|
deb259 |
* Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
|
|
|
deb259 |
* Copyright(c) 2016 - 2017 Intel Deutschland GmbH
|
|
|
deb259 |
+ * Copyright(c) 2018 Intel Corporation
|
|
|
deb259 |
* All rights reserved.
|
|
|
deb259 |
*
|
|
|
deb259 |
* Redistribution and use in source and binary forms, with or without
|
|
|
deb259 |
@@ -4166,31 +4167,6 @@
|
|
|
deb259 |
return ret;
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
-static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
|
|
|
deb259 |
- struct ieee80211_vif *vif,
|
|
|
deb259 |
- struct ieee80211_channel_switch *chsw)
|
|
|
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_MODIFY),
|
|
|
deb259 |
- .tsf = cpu_to_le32(chsw->timestamp),
|
|
|
deb259 |
- .cs_count = chsw->count,
|
|
|
deb259 |
- };
|
|
|
deb259 |
-
|
|
|
deb259 |
- if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))
|
|
|
deb259 |
- return;
|
|
|
deb259 |
-
|
|
|
deb259 |
- IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d\n", mvmvif->id);
|
|
|
deb259 |
-
|
|
|
deb259 |
- WARN_ON(iwl_mvm_send_cmd_pdu(mvm,
|
|
|
deb259 |
- WIDE_ID(MAC_CONF_GROUP,
|
|
|
deb259 |
- CHANNEL_SWITCH_TIME_EVENT_CMD),
|
|
|
deb259 |
- CMD_ASYNC, sizeof(cmd), &cmd));
|
|
|
deb259 |
-}
|
|
|
deb259 |
-
|
|
|
deb259 |
static void iwl_mvm_abort_channel_switch(struct ieee80211_hw *hw,
|
|
|
deb259 |
struct ieee80211_vif *vif)
|
|
|
deb259 |
{
|
|
|
deb259 |
@@ -4590,7 +4566,6 @@
|
|
|
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 |
- .channel_switch_rx_beacon = iwl_mvm_channel_switch_rx_beacon,
|
|
|
deb259 |
|
|
|
deb259 |
.tdls_channel_switch = iwl_mvm_tdls_channel_switch,
|
|
|
deb259 |
.tdls_cancel_channel_switch = iwl_mvm_tdls_cancel_channel_switch,
|