|
 |
deb259 |
From 49be6e27c80189463bf9940c42e49c8c803effee Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 25 Jul 2019 13:48:10 +0200
|
|
|
deb259 |
Subject: [PATCH 1/7] Revert "iwlwifi: mvm: report FTM start time TSF when
|
|
|
deb259 |
applicable"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit cec2d4f6b4e3f7dba2f3281464d835d7003aaa6f.
|
|
|
deb259 |
---
|
|
|
deb259 |
.../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 20 +++-----------------
|
|
|
deb259 |
1 file changed, 3 insertions(+), 17 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
|
|
|
deb259 |
index fec38a47696e..b15a4db7198e 100644
|
|
|
deb259 |
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
|
|
|
deb259 |
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
|
|
|
deb259 |
@@ -187,24 +187,12 @@ static void iwl_mvm_ftm_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
|
|
|
deb259 |
for (i = 0; i < ETH_ALEN; i++)
|
|
|
deb259 |
cmd->macaddr_mask[i] = ~req->mac_addr_mask[i];
|
|
|
deb259 |
|
|
|
deb259 |
- if (vif->bss_conf.assoc) {
|
|
|
deb259 |
+ if (vif->bss_conf.assoc)
|
|
|
deb259 |
memcpy(cmd->range_req_bssid, vif->bss_conf.bssid, ETH_ALEN);
|
|
|
deb259 |
-
|
|
|
deb259 |
- /* AP's TSF is only relevant if associated */
|
|
|
deb259 |
- for (i = 0; i < req->n_peers; i++) {
|
|
|
deb259 |
- if (req->peers[i].report_ap_tsf) {
|
|
|
deb259 |
- struct iwl_mvm_vif *mvmvif =
|
|
|
deb259 |
- iwl_mvm_vif_from_mac80211(vif);
|
|
|
deb259 |
-
|
|
|
deb259 |
- cmd->tsf_mac_id = cpu_to_le32(mvmvif->id);
|
|
|
deb259 |
- return;
|
|
|
deb259 |
- }
|
|
|
deb259 |
- }
|
|
|
deb259 |
- } else {
|
|
|
deb259 |
+ else
|
|
|
deb259 |
eth_broadcast_addr(cmd->range_req_bssid);
|
|
|
deb259 |
- }
|
|
|
deb259 |
|
|
|
deb259 |
- /* Don't report AP's TSF */
|
|
|
deb259 |
+ /* TODO: fill in tsf_mac_id if needed */
|
|
|
deb259 |
cmd->tsf_mac_id = cpu_to_le32(0xff);
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
@@ -539,8 +527,6 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
|
|
|
deb259 |
fw_ap = (void *)&fw_resp_v6->ap[i];
|
|
|
deb259 |
|
|
|
deb259 |
result.final = fw_resp->ap[i].last_burst;
|
|
|
deb259 |
- result.ap_tsf = le32_to_cpu(fw_ap->start_tsf);
|
|
|
deb259 |
- result.ap_tsf_valid = 1;
|
|
|
deb259 |
} else {
|
|
|
deb259 |
/* the first part is the same for old and new APIs */
|
|
|
deb259 |
fw_ap = (void *)&fw_resp_v5->ap[i];
|
|
|
deb259 |
--
|
|
|
deb259 |
2.13.6
|
|
|
deb259 |
|