FIX: [iw] add FTM respone attr dist avg patch

id: 414273
This commit is contained in:
Patrick Walther 2023-07-24 18:07:48 +02:00
parent 183c1e648d
commit 00c356d408
2 changed files with 101 additions and 0 deletions

View File

@ -0,0 +1,100 @@
diff --git a/event.c b/event.c
index ed157af..92aa53a 100644
--- a/event.c
+++ b/event.c
@@ -464,6 +464,14 @@ static void parse_pmsr_ftm_data(struct nlattr *data)
PFTM(u64, DIST_VARIANCE, unsigned);
PFTM(u64, DIST_SPREAD, unsigned);
+ if (!ftm[NL80211_PMSR_FTM_RESP_ATTR_DIST_AVG] \
+ && ftm[NL80211_PMSR_FTM_RESP_ATTR_RTT_AVG]){
+ signed long long dist_avg = (signed long long)nla_get_u64( \
+ ftm[NL80211_PMSR_FTM_RESP_ATTR_RTT_AVG]);
+ dist_avg = dist_avg * 100 / 6666;
+ printf(" DEBUG_DIST_AVG: %lld\n", dist_avg );
+ }
+
if (ftm[NL80211_PMSR_FTM_RESP_ATTR_TX_RATE]) {
char buf[100];
@@ -971,7 +979,6 @@ static int print_event(struct nl_msg *msg, void *arg)
}
switch (gnlh->cmd) {
-#ifdef IW_FULL
case NL80211_CMD_NEW_WIPHY:
printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
break;
@@ -1007,7 +1014,6 @@ static int print_event(struct nl_msg *msg, void *arg)
case NL80211_CMD_SCHED_SCAN_RESULTS:
printf("got scheduled scan results\n");
break;
-#endif
case NL80211_CMD_WIPHY_REG_CHANGE:
case NL80211_CMD_REG_CHANGE:
if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE)
@@ -1090,7 +1096,6 @@ static int print_event(struct nl_msg *msg, void *arg)
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
printf("del station %s\n", macbuf);
break;
-#ifdef IW_FULL
case NL80211_CMD_JOIN_IBSS:
mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
printf("IBSS %s joined\n", macbuf);
@@ -1295,7 +1300,6 @@ static int print_event(struct nl_msg *msg, void *arg)
case NL80211_CMD_CH_SWITCH_NOTIFY:
parse_ch_switch_notify(tb, gnlh->cmd);
break;
-#endif
default:
printf("unknown event %d\n", gnlh->cmd);
break;
diff --git a/info.c b/info.c
index 4bdcc07..9260659 100644
--- a/info.c
+++ b/info.c
@@ -317,7 +317,6 @@ next:
}
}
-#ifdef IW_FULL
if (tb_band[NL80211_BAND_ATTR_RATES]) {
printf("\t\tBitrates (non-HT):\n");
nla_for_each_nested(nl_rate, tb_band[NL80211_BAND_ATTR_RATES], rem_rate) {
@@ -334,7 +333,6 @@ next:
printf("\n");
}
}
-#endif
}
}
@@ -400,7 +398,6 @@ next:
printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
}
-#ifdef IW_FULL
if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
int num = nla_len(tb_msg[NL80211_ATTR_CIPHER_SUITES]) / sizeof(__u32);
int i;
@@ -412,7 +409,6 @@ next:
cipher_name(ciphers[i]));
}
}
-#endif
if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX] &&
tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
@@ -430,11 +426,10 @@ next:
print_iftype_list("\tSupported interface modes", "\t\t",
tb_msg[NL80211_ATTR_SUPPORTED_IFTYPES]);
-#ifdef IW_FULL
if (tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES])
print_iftype_list("\tsoftware interface modes (can always be added)",
"\t\t", tb_msg[NL80211_ATTR_SOFTWARE_IFTYPES]);
-#endif
+
if (tb_msg[NL80211_ATTR_INTERFACE_COMBINATIONS]) {
struct nlattr *nl_combi;

View File

@ -20,6 +20,7 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.xz \
file://402-show-ant-gain.patch \
file://403-clockbootime.patch \
file://404-ftm.patch \
file://405-ftm-resp-attr-dist-avg.patch \
"
SRC_URI[sha256sum] = "f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e"