|
 |
deb259 |
From 866f912283b38bb8429ae5d0ce11e4f0575f6d84 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Fri, 6 Sep 2019 01:40:46 +0200
|
|
|
deb259 |
Subject: [PATCH 2/6] Revert "iwlwifi: mvm: track changes in beacon count
|
|
|
deb259 |
during channel switch"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 81b4e44e41e651735dd185f78a8fe2f4d53c61d4.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 ---------------
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 --
|
|
|
deb259 |
2 files changed, 17 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:48.986807002 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:45:49.284803166 +0200
|
|
|
deb259 |
@@ -4197,9 +4197,6 @@
|
|
|
deb259 |
iwl_mvm_schedule_csa_period(mvm, vif,
|
|
|
deb259 |
vif->bss_conf.beacon_int,
|
|
|
deb259 |
apply_time);
|
|
|
deb259 |
-
|
|
|
deb259 |
- mvmvif->csa_count = chsw->count;
|
|
|
deb259 |
- mvmvif->csa_misbehave = false;
|
|
|
deb259 |
break;
|
|
|
deb259 |
default:
|
|
|
deb259 |
break;
|
|
|
deb259 |
@@ -4238,18 +4235,6 @@
|
|
|
deb259 |
if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))
|
|
|
deb259 |
return;
|
|
|
deb259 |
|
|
|
deb259 |
- if (chsw->count >= mvmvif->csa_count && chsw->block_tx) {
|
|
|
deb259 |
- if (mvmvif->csa_misbehave) {
|
|
|
deb259 |
- /* Second time, give up on this AP*/
|
|
|
deb259 |
- iwl_mvm_abort_channel_switch(hw, vif);
|
|
|
deb259 |
- ieee80211_chswitch_done(vif, false);
|
|
|
deb259 |
- mvmvif->csa_misbehave = false;
|
|
|
deb259 |
- return;
|
|
|
deb259 |
- }
|
|
|
deb259 |
- mvmvif->csa_misbehave = true;
|
|
|
deb259 |
- }
|
|
|
deb259 |
- mvmvif->csa_count = chsw->count;
|
|
|
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 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h 2019-09-06 01:36:13.968210234 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h 2019-09-06 01:45:49.284803166 +0200
|
|
|
deb259 |
@@ -490,8 +490,6 @@
|
|
|
deb259 |
bool csa_countdown;
|
|
|
deb259 |
bool csa_failed;
|
|
|
deb259 |
u16 csa_target_freq;
|
|
|
deb259 |
- u16 csa_count;
|
|
|
deb259 |
- u16 csa_misbehave;
|
|
|
deb259 |
struct delayed_work csa_work;
|
|
|
deb259 |
|
|
|
deb259 |
/* Indicates that we are waiting for a beacon on a new channel */
|