|
 |
deb259 |
From 2cc08d0bf6d1a756ba1484b7f4fff97328034ccc Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Fri, 6 Sep 2019 02:08:03 +0200
|
|
|
deb259 |
Subject: [PATCH 3/7] Revert "iwlwifi: mvm: add read debugfs for
|
|
|
deb259 |
he_sniffer_params"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 8bf52e0ab3d6c4c64295250382fcff2d9d3fed6a.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 25 ++----------------------
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 -
|
|
|
deb259 |
2 files changed, 2 insertions(+), 24 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c 2019-09-06 02:01:40.436557307 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c 2019-09-06 02:17:21.739438249 +0200
|
|
|
deb259 |
@@ -1783,7 +1783,6 @@
|
|
|
deb259 |
|
|
|
deb259 |
struct iwl_mvm_sniffer_apply {
|
|
|
deb259 |
struct iwl_mvm *mvm;
|
|
|
deb259 |
- u8 *bssid;
|
|
|
deb259 |
u16 aid;
|
|
|
deb259 |
};
|
|
|
deb259 |
|
|
|
deb259 |
@@ -1793,8 +1792,6 @@
|
|
|
deb259 |
struct iwl_mvm_sniffer_apply *apply = data;
|
|
|
deb259 |
|
|
|
deb259 |
apply->mvm->cur_aid = cpu_to_le16(apply->aid);
|
|
|
deb259 |
- memcpy(apply->mvm->cur_bssid, apply->bssid,
|
|
|
deb259 |
- sizeof(apply->mvm->cur_bssid));
|
|
|
deb259 |
|
|
|
deb259 |
return true;
|
|
|
deb259 |
}
|
|
|
deb259 |
@@ -1827,7 +1824,6 @@
|
|
|
deb259 |
he_mon_cmd.aid = cpu_to_le16(aid);
|
|
|
deb259 |
|
|
|
deb259 |
apply.aid = aid;
|
|
|
deb259 |
- apply.bssid = (void *)he_mon_cmd.bssid;
|
|
|
deb259 |
|
|
|
deb259 |
mutex_lock(&mvm->mutex);
|
|
|
deb259 |
|
|
|
deb259 |
@@ -1857,23 +1853,6 @@
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
static ssize_t
|
|
|
deb259 |
-iwl_dbgfs_he_sniffer_params_read(struct file *file, char __user *user_buf,
|
|
|
deb259 |
- size_t count, loff_t *ppos)
|
|
|
deb259 |
-{
|
|
|
deb259 |
- struct iwl_mvm *mvm = file->private_data;
|
|
|
deb259 |
- u8 buf[32];
|
|
|
deb259 |
- int len;
|
|
|
deb259 |
-
|
|
|
deb259 |
- len = scnprintf(buf, sizeof(buf),
|
|
|
deb259 |
- "%d %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",
|
|
|
deb259 |
- le16_to_cpu(mvm->cur_aid), mvm->cur_bssid[0],
|
|
|
deb259 |
- mvm->cur_bssid[1], mvm->cur_bssid[2], mvm->cur_bssid[3],
|
|
|
deb259 |
- mvm->cur_bssid[4], mvm->cur_bssid[5]);
|
|
|
deb259 |
-
|
|
|
deb259 |
- return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
deb259 |
-}
|
|
|
deb259 |
-
|
|
|
deb259 |
-static ssize_t
|
|
|
deb259 |
iwl_dbgfs_uapsd_noagg_bssids_read(struct file *file, char __user *user_buf,
|
|
|
deb259 |
size_t count, loff_t *ppos)
|
|
|
deb259 |
{
|
|
|
deb259 |
@@ -1943,7 +1922,7 @@
|
|
|
deb259 |
MVM_DEBUGFS_READ_FILE_OPS(sar_geo_profile);
|
|
|
deb259 |
#endif
|
|
|
deb259 |
|
|
|
deb259 |
-MVM_DEBUGFS_READ_WRITE_FILE_OPS(he_sniffer_params, 32);
|
|
|
deb259 |
+MVM_DEBUGFS_WRITE_FILE_OPS(he_sniffer_params, 32);
|
|
|
deb259 |
|
|
|
deb259 |
static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,
|
|
|
deb259 |
size_t count, loff_t *ppos)
|
|
|
deb259 |
@@ -2130,7 +2109,7 @@
|
|
|
deb259 |
#ifdef CONFIG_ACPI
|
|
|
deb259 |
MVM_DEBUGFS_ADD_FILE(sar_geo_profile, dbgfs_dir, 0400);
|
|
|
deb259 |
#endif
|
|
|
deb259 |
- MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm->debugfs_dir, 0600);
|
|
|
deb259 |
+ MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm->debugfs_dir, 0200);
|
|
|
deb259 |
|
|
|
deb259 |
debugfs_create_bool("enable_scan_iteration_notif", 0600,
|
|
|
deb259 |
mvm->debugfs_dir, &mvm->scan_iter_notif_enabled);
|
|
|
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 02:01:40.729553534 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h 2019-09-06 02:17:21.740438236 +0200
|
|
|
deb259 |
@@ -1135,7 +1135,6 @@
|
|
|
deb259 |
|
|
|
deb259 |
/* sniffer data to include in radiotap */
|
|
|
deb259 |
__le16 cur_aid;
|
|
|
deb259 |
- u8 cur_bssid[ETH_ALEN];
|
|
|
deb259 |
|
|
|
deb259 |
#ifdef CONFIG_ACPI
|
|
|
deb259 |
struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
|