iwlwifi: mvm: Fix tof debugfs formats (dec vs. hex)

Make some input formats more natural, e.g. bandwidth and periods
are more natural in decimal than in hexadecimal.

Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index 334ae56e5d8b24fdb07857c86dd0bd70e13d4017..15ab543f7156fa9de5ce7b3558a82cef1de69dae 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -913,11 +913,11 @@ static ssize_t iwl_dbgfs_tof_range_request_write(struct ieee80211_vif *vif,
                u8 *mac = ap.bssid;
                unsigned int i;
 
-               if (sscanf(data, "%u %hhd %hhx %hhx"
+               if (sscanf(data, "%u %hhd %hhd %hhd"
                           "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"
-                          "%hhx %hhx %hx"
-                          "%hhx %hhx %x"
-                          "%hhx %hhx %hhx %hhx",
+                          "%hhd %hhd %hd"
+                          "%hhd %hhd %d"
+                          "%hhx %hhd %hhd %hhd",
                           &i, &ap.channel_num, &ap.bandwidth,
                           &ap.ctrl_ch_position,
                           mac, mac + 1, mac + 2, mac + 3, mac + 4, mac + 5,
@@ -994,16 +994,18 @@ static ssize_t iwl_dbgfs_tof_range_request_read(struct file *file,
                struct iwl_tof_range_req_ap_entry *ap = &cmd->ap[i];
 
                pos += scnprintf(buf + pos, bufsz - pos,
-                               "ap %.2d: channel_num=%hhx bw=%hhx"
-                               " control=%hhx bssid=%pM type=%hhx"
-                               " num_of_bursts=%hhx burst_period=%hx ftm=%hhx"
-                               " retries=%hhx tsf_delta=%x location_req=%hhx "
-                               " asap=%hhx enable=%hhx rssi=%hhx\n",
+                               "ap %.2d: channel_num=%hhd bw=%hhd"
+                               " control=%hhd bssid=%pM type=%hhd"
+                               " num_of_bursts=%hhd burst_period=%hd ftm=%hhd"
+                               " retries=%hhd tsf_delta=%d"
+                               " tsf_delta_direction=%hhd location_req=0x%hhx "
+                               " asap=%hhd enable=%hhd rssi=%hhd\n",
                                i, ap->channel_num, ap->bandwidth,
                                ap->ctrl_ch_position, ap->bssid,
                                ap->measure_type, ap->num_of_bursts,
                                ap->burst_period, ap->samples_per_burst,
                                ap->retries_per_sample, ap->tsf_delta,
+                               ap->tsf_delta_direction,
                                ap->location_req, ap->asap_mode,
                                ap->enable_dyn_ack, ap->rssi);
        }
@@ -1099,18 +1101,18 @@ static ssize_t iwl_dbgfs_tof_range_req_ext_read(struct file *file,
        mutex_lock(&mvm->mutex);
 
        pos += scnprintf(buf + pos, bufsz - pos,
-                        "tsf_timer_offset_msec = %hx\n",
+                        "tsf_timer_offset_msec = %hd\n",
                         cmd->tsf_timer_offset_msec);
-       pos += scnprintf(buf + pos, bufsz - pos, "min_delta_ftm = %hhx\n",
+       pos += scnprintf(buf + pos, bufsz - pos, "min_delta_ftm = %hhd\n",
                         cmd->min_delta_ftm);
        pos += scnprintf(buf + pos, bufsz - pos,
-                        "ftm_format_and_bw20M = %hhx\n",
+                        "ftm_format_and_bw20M = %hhd\n",
                         cmd->ftm_format_and_bw20M);
        pos += scnprintf(buf + pos, bufsz - pos,
-                        "ftm_format_and_bw40M = %hhx\n",
+                        "ftm_format_and_bw40M = %hhd\n",
                         cmd->ftm_format_and_bw40M);
        pos += scnprintf(buf + pos, bufsz - pos,
-                        "ftm_format_and_bw80M = %hhx\n",
+                        "ftm_format_and_bw80M = %hhd\n",
                         cmd->ftm_format_and_bw80M);
 
        mutex_unlock(&mvm->mutex);
@@ -1205,11 +1207,11 @@ static ssize_t iwl_dbgfs_tof_range_response_read(struct file *file,
                struct iwl_tof_range_rsp_ap_entry_ntfy *ap = &cmd->ap[i];
 
                pos += scnprintf(buf + pos, bufsz - pos,
-                               "ap %.2d: bssid=%pM status=%hhx bw=%hhx"
-                               " rtt=%x rtt_var=%x rtt_spread=%x"
-                               " rssi=%hhx  rssi_spread=%hhx"
-                               " range=%x range_var=%x"
-                               " time_stamp=%x\n",
+                               "ap %.2d: bssid=%pM status=%hhd bw=%hhd"
+                               " rtt=%d rtt_var=%d rtt_spread=%d"
+                               " rssi=%hhd  rssi_spread=%hhd"
+                               " range=%d range_var=%d"
+                               " time_stamp=%d\n",
                                i, ap->bssid, ap->measure_status,
                                ap->measure_bw,
                                ap->rtt, ap->rtt_variance, ap->rtt_spread,