de21729578
* Linux: Update kernel 5.15.25 Use highest available kernel version in Buildroot 2021.08 (5.13) * Update Hardkernel patches to Linux 5.15 * Update generic-x86-64/ova kernel config/patches for 5.15 * Drop Intel e1000e Sourceforge driver The driver has been discontinued sometime last year. The main reason the out-of-tree kernel has been enabled was for support for the i219-V network chips which meanwhile are supported in mainline.
99 lines
4.1 KiB
Diff
99 lines
4.1 KiB
Diff
From d6be44a647dc6ae5ad2dcf44ff4a97030f1c498e Mon Sep 17 00:00:00 2001
|
|
Message-Id: <d6be44a647dc6ae5ad2dcf44ff4a97030f1c498e.1646056626.git.stefan@agner.ch>
|
|
From: Zachary Michaels <mikezackles@gmail.com>
|
|
Date: Thu, 7 Jan 2021 08:13:11 -0800
|
|
Subject: [PATCH] iwlwifi: Make missed beacon timeout configurable
|
|
|
|
Makes the beacon timeout a module parameter, allowing the original default (16
|
|
missed beacons) to be kept while also enabling users that experience problems to
|
|
increase the timeout.
|
|
|
|
See https://bugzilla.kernel.org/show_bug.cgi?id=203709
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++++
|
|
drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 ++
|
|
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 ++-
|
|
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 -
|
|
4 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
|
index 524b0ad87357..a055674f14c6 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
|
@@ -1711,6 +1711,7 @@ struct iwl_mod_params iwlwifi_mod_params = {
|
|
.power_level = IWL_POWER_INDEX_1,
|
|
.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
|
|
.enable_ini = true,
|
|
+ .beacon_timeout = 16,
|
|
/* the rest are 0 by default */
|
|
};
|
|
IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
|
|
@@ -1826,6 +1827,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini,
|
|
bool, S_IRUGO | S_IWUSR);
|
|
MODULE_PARM_DESC(enable_ini,
|
|
"Enable debug INI TLV FW debug infrastructure (default: true");
|
|
+module_param_named(beacon_timeout, iwlwifi_mod_params.beacon_timeout, uint, 0644);
|
|
+MODULE_PARM_DESC(beacon_timeout,
|
|
+ "Number of missed beacons before disconnecting (default: 16)");
|
|
|
|
/*
|
|
* set bt_coex_active to true, uCode will do kill/defer
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
|
|
index 004ebdac4535..198c5ac2575b 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
|
|
@@ -62,6 +62,7 @@ enum iwl_uapsd_disable {
|
|
* @disable_11ac: disable VHT capabilities, default = false.
|
|
* @remove_when_gone: remove an inaccessible device from the PCIe bus.
|
|
* @enable_ini: enable new FW debug infratructure (INI TLVs)
|
|
+ * @beacon_timeout: number of missed beacons before disconnect, default = 16
|
|
*/
|
|
struct iwl_mod_params {
|
|
int swcrypto;
|
|
@@ -84,6 +85,7 @@ struct iwl_mod_params {
|
|
bool disable_11ax;
|
|
bool remove_when_gone;
|
|
bool enable_ini;
|
|
+ u32 beacon_timeout;
|
|
};
|
|
|
|
static inline bool iwl_enable_rx_ampdu(void)
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
|
|
index fd352b2624a6..2f70a36b1af9 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
|
|
@@ -8,6 +8,7 @@
|
|
#include <linux/crc32.h>
|
|
#include <net/mac80211.h>
|
|
#include "iwl-io.h"
|
|
+#include "iwl-modparams.h"
|
|
#include "iwl-prph.h"
|
|
#include "fw-api.h"
|
|
#include "mvm.h"
|
|
@@ -1398,7 +1399,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm,
|
|
* TODO: the threshold should be adjusted based on latency conditions,
|
|
* and/or in case of a CS flow on one of the other AP vifs.
|
|
*/
|
|
- if (rx_missed_bcon > IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG)
|
|
+ if (rx_missed_bcon > iwlwifi_mod_params.beacon_timeout)
|
|
iwl_mvm_connection_loss(mvm, vif, "missed beacons");
|
|
else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD)
|
|
ieee80211_beacon_loss(vif);
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
|
|
index 46af8dd2dc93..bb05df29c88b 100644
|
|
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
|
|
@@ -38,7 +38,6 @@
|
|
/* RSSI offset for WkP */
|
|
#define IWL_RSSI_OFFSET 50
|
|
#define IWL_MVM_MISSED_BEACONS_THRESHOLD 8
|
|
-#define IWL_MVM_MISSED_BEACONS_THRESHOLD_LONG 16
|
|
|
|
/* A TimeUnit is 1024 microsecond */
|
|
#define MSEC_TO_TU(_msec) (_msec*1000/1024)
|
|
--
|
|
2.35.1
|
|
|