From c41971e27a8359f88122593a2700f270f58cb2fa Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Sat, 5 Apr 2025 20:48:05 +0200 Subject: [PATCH 1/2] iw: fix HE capabilities on Big Endian platforms IE fields are encoded in Little Endian and are not correctly printed on Big Endian platforms. Fixes: c741be9f6ca3 ("iw: print HE capabilities") Signed-off-by: Aleksander Jan Bajkowski Link: https://patch.msgid.link/20250405184807.701728-2-olek2@wp.pl Signed-off-by: Johannes Berg --- util.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) --- a/util.c +++ b/util.c @@ -1245,14 +1245,15 @@ static void __print_he_capa(const __u16 #define PRINT_HE_CAP(_var, _idx, _bit, _str) \ do { \ - if (_var[_idx] & BIT(_bit)) \ + if (le16toh(_var[_idx]) & BIT(_bit)) \ printf("%s\t\t\t" _str "\n", pre); \ } while (0) #define PRINT_HE_CAP_MASK(_var, _idx, _shift, _mask, _str) \ do { \ - if ((_var[_idx] >> _shift) & _mask) \ - printf("%s\t\t\t" _str ": %d\n", pre, (_var[_idx] >> _shift) & _mask); \ + if ((le16toh(_var[_idx]) >> _shift) & _mask) \ + printf("%s\t\t\t" _str ": %d\n", pre, \ + (le16toh(_var[_idx]) >> _shift) & _mask); \ } while (0) #define PRINT_HE_MAC_CAP(...) PRINT_HE_CAP(mac_cap, __VA_ARGS__) @@ -1263,7 +1264,7 @@ static void __print_he_capa(const __u16 printf("%s\t\tHE MAC Capabilities (0x", pre); for (i = 0; i < 3; i++) - printf("%04x", mac_cap[i]); + printf("%04x", le16toh(mac_cap[i])); printf("):\n"); PRINT_HE_MAC_CAP(0, 0, "+HTC HE Supported"); @@ -1377,18 +1378,18 @@ static void __print_he_capa(const __u16 char *bw[] = { "<= 80", "160", "80+80" }; int j; - if ((phy_cap[0] & (phy_cap_support[i] << 8)) == 0) + if ((le16toh(phy_cap[0]) & (phy_cap_support[i] << 8)) == 0) continue; /* Supports more, but overflow? Abort. */ - if ((i * 2 + 2) * sizeof(mcs_set[0]) >= mcs_len) + if ((i * 2 + 2) * sizeof(le16toh(mcs_set[0])) >= mcs_len) return; for (j = 0; j < 2; j++) { int k; printf("%s\t\tHE %s MCS and NSS set %s MHz\n", pre, j ? "TX" : "RX", bw[i]); for (k = 0; k < 8; k++) { - __u16 mcs = mcs_set[(i * 2) + j]; + __u16 mcs = le16toh(mcs_set[(i * 2) + j]); mcs >>= k * 2; mcs &= 0x3; printf("%s\t\t\t%d streams: ", pre, k + 1); @@ -1411,7 +1412,7 @@ static void __print_he_capa(const __u16 ppet_len = 0; } - if (ppet_len && (phy_cap[3] & BIT(15))) { + if (ppet_len && (le16toh(phy_cap[3]) & BIT(15))) { printf("%s\t\tPPE Threshold ", pre); for (i = 0; i < ppet_len; i++) if (ppet[i])