[openwrt/openwrt] iw: backport he operation scan support
LEDE Commits
lede-commits at lists.infradead.org
Wed Mar 26 02:05:41 PDT 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/cf04dbcf4a93ec9603de961eb6ef5aaaf5003ffd
commit cf04dbcf4a93ec9603de961eb6ef5aaaf5003ffd
Author: Aleksander Jan Bajkowski <olek2 at wp.pl>
AuthorDate: Fri Feb 28 22:07:54 2025 +0100
iw: backport he operation scan support
With this patch, iw can now scan APs in the 6 GHz band and shows
their operation parameters:
~~~
6 Ghz Operation Information: 0x0103070f06
Primary Channel: 1
Channel Width: 80+80 or 160 MHz
Regulatory Info: 0
Center Frequency Segment 0: 7
Center Frequency Segment 1: 15
Minimum Rate: 6
~~~
Signed-off-by: Aleksander Jan Bajkowski <olek2 at wp.pl>
Link: https://github.com/openwrt/openwrt/pull/18240
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
package/network/utils/iw/Makefile | 2 +-
...scan-Add-printing-of-HE-Operation-Element.patch | 153 +++++++++++++++++++++
.../network/utils/iw/patches/200-reduce_size.patch | 10 +-
3 files changed, 159 insertions(+), 6 deletions(-)
diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
index 1237c106a9..15136d2d2d 100644
--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iw
PKG_VERSION:=6.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/software/network/iw
diff --git a/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch b/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch
new file mode 100644
index 0000000000..a251ceea37
--- /dev/null
+++ b/package/network/utils/iw/patches/100-scan-Add-printing-of-HE-Operation-Element.patch
@@ -0,0 +1,153 @@
+From 422419e06d55a7c852d1f6f054a094e285ebaa27 Mon Sep 17 00:00:00 2001
+From: Christopher A Wills <christopher.a.wills at intel.com>
+Date: Tue, 30 Jul 2024 16:27:36 -0700
+Subject: [PATCH] scan: Add printing of HE Operation Element
+
+Signed-off-by: Christopher A Wills <christopher.a.wills at intel.com>
+---
+ iw.h | 1 +
+ scan.c | 8 +++++
+ util.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 112 insertions(+)
+
+--- a/iw.h
++++ b/iw.h
+@@ -222,6 +222,7 @@ void print_ampdu_spacing(__u8 spacing);
+ void print_ht_capability(__u16 cap);
+ void print_vht_info(__u32 capa, const __u8 *mcs);
+ void print_he_capability(const uint8_t *ie, int len);
++void print_he_operation(const uint8_t *ie, int len);
+ void print_he_info(struct nlattr *nl_iftype);
+ void print_eht_info(struct nlattr *nl_iftype, int band);
+ void print_s1g_capability(const uint8_t *caps);
+--- a/scan.c
++++ b/scan.c
+@@ -2384,8 +2384,16 @@ static void print_he_capa(const uint8_t
+ print_he_capability(data, len);
+ }
+
++static void print_he_oper(const uint8_t type, uint8_t len, const uint8_t *data,
++ const struct print_ies_data *ie_buffer)
++{
++ printf("\n");
++ print_he_operation(data, len);
++}
++
+ static const struct ie_print ext_printers[] = {
+ [35] = { "HE capabilities", print_he_capa, 21, 54, BIT(PRINT_SCAN), },
++ [36] = { "HE Operation", print_he_oper, 6, 15, BIT(PRINT_SCAN), },
+ };
+
+ static void print_extension(unsigned char len, unsigned char *ie,
+--- a/util.c
++++ b/util.c
+@@ -1733,6 +1733,109 @@ void print_he_capability(const uint8_t *
+ __print_he_capa(mac_cap, phy_cap - 1, mcs_set, mcs_len, NULL, 0, false);
+ }
+
++void print_he_operation(const uint8_t *ie, int len)
++{
++ uint8_t oper_parameters[3] = {ie[0], ie[1], ie[2] };
++ uint8_t bss_color = ie[3];
++ uint16_t nss_mcs_set = *(uint16_t*)(&ie[4]);
++ uint8_t vht_oper_present = oper_parameters[1] & 0x40;
++ uint8_t co_hosted_bss_present = oper_parameters[1] & 0x80;
++ uint8_t uhb_operation_info_present = oper_parameters[2] & 0x02;
++ uint8_t offset = 6;
++
++ printf("\t\tHE Operation Parameters: (0x%02x%02x%02x)\n",
++ oper_parameters[2], oper_parameters[1], oper_parameters[0]);
++ printf("\t\t\tDefault PE Duration: %hhu\n", oper_parameters[0] & 0x07);
++ if (oper_parameters[0] & 0x08)
++ printf("\t\t\tTWT Required\n");
++
++ printf("\t\t\tTXOP Duration RTS Threshold: %hu\n",
++ (*(uint16_t*)(oper_parameters)) >> 4 & 0x03ff);
++ if (oper_parameters[1] & 0x40)
++ printf("\t\t\tVHT Operation Information Present\n");
++
++ if (oper_parameters[1] & 0x80)
++ printf("\t\t\tCo-Hosted BSS\n");
++
++ if (oper_parameters[2] & 0x01)
++ printf("\t\t\tER SU Disable\n");
++
++ if (oper_parameters[2] & 0x02)
++ printf("\t\t\t6 GHz Operation Information Present\n");
++
++ printf("\t\tBSS Color: %hhu\n", bss_color & 0x3F);
++ if (bss_color & 0x40)
++ printf("\t\tPartial BSS Color\n");
++
++ if (bss_color & 0x80)
++ printf("\t\tBSS Color Disabled\n");
++
++ printf("\t\tBasic HE-MCS NSS Set: 0x%04x\n", nss_mcs_set);
++ for (int k = 0; k < 8; k++) {
++ __u16 mcs = nss_mcs_set;
++
++ mcs >>= k * 2;
++ mcs &= 0x3;
++ printf("\t\t\t%d streams: ", k + 1);
++ if (mcs == 3)
++ printf("not supported\n");
++ else
++ printf("MCS 0-%d\n", 7 + (mcs * 2));
++ }
++
++ if (vht_oper_present) {
++ if (len - offset < 3) {
++ printf("\t\tVHT Operation Info: Invalid\n");
++ return;
++ }
++
++ printf("\t\tVHT Operation Info: 0x%02x%02x%02x\n",
++ ie[offset + 2], ie[offset + 1], ie[offset + 0]);
++ offset += 3;
++ }
++
++ if (co_hosted_bss_present) {
++ if (len - offset < 1) {
++ printf("\t\tMax Co-Hosted BSSID: Invalid\n");
++ return;
++ }
++
++ printf("\t\tMax Co-Hosted BSSID: %hhu\n", ie[offset]);
++ offset += 1;
++ }
++
++ if (uhb_operation_info_present) {
++ if (len - offset < 5) {
++ printf("\t\t6 GHz Operation Info: Invalid\n");
++ return;
++ } else {
++ const uint8_t control = ie[offset + 1];
++
++ printf("\t\t6 Ghz Operation Information: 0x");
++ for (uint8_t i = 0; i < 5; i++)
++ printf("%02x", ie[offset + i]);
++
++ printf("\n");
++ printf("\t\t\tPrimary Channel: %hhu\n", ie[offset]);
++ printf("\t\t\tChannel Width: ");
++ switch (control & 0x3) {
++ case 0: printf("20 MHz\n"); break;
++ case 1: printf("40 MHz\n"); break;
++ case 2: printf("80 MHz\n"); break;
++ case 3: printf("80+80 or 160 MHz\n"); break;
++ }
++
++ if (control & 0x4)
++ printf("\t\t\tDuplicate Beacon: True\n");
++
++ printf("\t\t\tRegulatory Info: %hhu\n", (control >> 3) & 0xf);
++ printf("\t\t\tCenter Frequency Segment 0: %hhu\n", ie[offset+2]);
++ printf("\t\t\tCenter Frequency Segment 1: %hhu\n", ie[offset+3]);
++ printf("\t\t\tMinimum Rate: %hhu\n", ie[offset+4]);
++ }
++ }
++}
++
+ void iw_hexdump(const char *prefix, const __u8 *buf, size_t size)
+ {
+ size_t i;
diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
index 9924ffa077..dc1cce99a2 100644
--- a/package/network/utils/iw/patches/200-reduce_size.patch
+++ b/package/network/utils/iw/patches/200-reduce_size.patch
@@ -212,7 +212,7 @@
if (len >= 4 && memcmp(data, wfa_oui, 3) == 0) {
if (data[3] < ARRAY_SIZE(wfa_printers) &&
wfa_printers[data[3]].name &&
-@@ -2483,6 +2494,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2491,6 +2502,7 @@ static void print_capa_non_dmg(__u16 cap
printf(" ESS");
if (capa & WLAN_CAPABILITY_IBSS)
printf(" IBSS");
@@ -220,7 +220,7 @@
if (capa & WLAN_CAPABILITY_CF_POLLABLE)
printf(" CfPollable");
if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
-@@ -2511,6 +2523,7 @@ static void print_capa_non_dmg(__u16 cap
+@@ -2519,6 +2531,7 @@ static void print_capa_non_dmg(__u16 cap
printf(" DelayedBACK");
if (capa & WLAN_CAPABILITY_IMM_BACK)
printf(" ImmediateBACK");
@@ -228,7 +228,7 @@
}
static int print_bss_handler(struct nl_msg *msg, void *arg)
-@@ -2601,8 +2614,10 @@ static int print_bss_handler(struct nl_m
+@@ -2609,8 +2622,10 @@ static int print_bss_handler(struct nl_m
else
printf("\tfreq: %d\n", freq);
@@ -239,7 +239,7 @@
}
if (bss[NL80211_BSS_BEACON_INTERVAL])
printf("\tbeacon interval: %d TUs\n",
-@@ -2796,6 +2811,7 @@ static int handle_stop_sched_scan(struct
+@@ -2804,6 +2819,7 @@ static int handle_stop_sched_scan(struct
return 0;
}
@@ -247,7 +247,7 @@
COMMAND(scan, sched_start,
SCHED_SCAN_OPTIONS,
NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
-@@ -2806,3 +2822,4 @@ COMMAND(scan, sched_start,
+@@ -2814,3 +2830,4 @@ COMMAND(scan, sched_start,
COMMAND(scan, sched_stop, "",
NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
"Stop an ongoing scheduled scan.");
More information about the lede-commits
mailing list