iwlwifi: mvm: report FTM start time TSF when applicable

When the interface that is requesting an FTM measurement is connected
to a BSS, it is possible that the FTM request was originated by an
RRM request from the AP. In this case the station needs to report
the measurement start time in terms of the TSF of the AP.

Since there is no indication in the FTM request itself if the TSF
is needed, always report the TSF if the station is associated.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index b15a4db7198e7ca4edad9903c842d32fed9ff7cd..fec38a47696e05d739b373748f92e813371b6f88 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -187,12 +187,24 @@ static void iwl_mvm_ftm_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        for (i = 0; i < ETH_ALEN; i++)
                cmd->macaddr_mask[i] = ~req->mac_addr_mask[i];
 
-       if (vif->bss_conf.assoc)
+       if (vif->bss_conf.assoc) {
                memcpy(cmd->range_req_bssid, vif->bss_conf.bssid, ETH_ALEN);
-       else
+
+               /* AP's TSF is only relevant if associated */
+               for (i = 0; i < req->n_peers; i++) {
+                       if (req->peers[i].report_ap_tsf) {
+                               struct iwl_mvm_vif *mvmvif =
+                                       iwl_mvm_vif_from_mac80211(vif);
+
+                               cmd->tsf_mac_id = cpu_to_le32(mvmvif->id);
+                               return;
+                       }
+               }
+       } else {
                eth_broadcast_addr(cmd->range_req_bssid);
+       }
 
-       /* TODO: fill in tsf_mac_id if needed */
+       /* Don't report AP's TSF */
        cmd->tsf_mac_id = cpu_to_le32(0xff);
 }
 
@@ -527,6 +539,8 @@ void iwl_mvm_ftm_range_resp(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
                                fw_ap = (void *)&fw_resp_v6->ap[i];
 
                        result.final = fw_resp->ap[i].last_burst;
+                       result.ap_tsf = le32_to_cpu(fw_ap->start_tsf);
+                       result.ap_tsf_valid = 1;
                } else {
                        /* the first part is the same for old and new APIs */
                        fw_ap = (void *)&fw_resp_v5->ap[i];