diff options
| author | Ben Greear <greearb@candelatech.com> | 2023-05-16 11:02:38 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-08-24 09:15:39 +0200 |
| commit | cf26fc9ab584833f01e27cc2dd09988179ec6a03 (patch) | |
| tree | f864d241e1d2a65cc7f78c4072b906e615a473d7 | |
| parent | f2d9f5b52677f5414dc194be94b5916d2b080eab (diff) | |
| download | iw-cf26fc9ab584833f01e27cc2dd09988179ec6a03.tar.gz | |
iw: Fix EHT rates printing.
The 20Mhz rates thing is a union with the others, so print one or
the other. This appears to fix the output of the mcs/bw printout.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | util.c | 46 |
1 files changed, 21 insertions, 25 deletions
@@ -1604,33 +1604,29 @@ static void __print_eht_capa(int band, printf("%s\t\tEHT bw=20 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", pre, mcs[i], mcs_set[i] & 0xf, mcs_set[i] >> 4); - } - - mcs_set += 4; - if (he_phy_cap[0] & (BIT(2) << 8)) { - for (i = 0; i < 3; i++) - printf("%s\t\tEHT bw <= 80 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", - pre, mcs[i + 1], - mcs_set[i] & 0xf, mcs_set[i] >> 4); - - } - - mcs_set += 3; - if (he_phy_cap[0] & (BIT(3) << 8)) { - for (i = 0; i < 3; i++) - printf("%s\t\tEHT bw=160 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", - pre, mcs[i + 1], - mcs_set[i] & 0xf, mcs_set[i] >> 4); - - } + } else { + if (he_phy_cap[0] & (BIT(2) << 8)) { + for (i = 0; i < 3; i++) + printf("%s\t\tEHT bw <= 80 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", + pre, mcs[i + 1], + mcs_set[i] & 0xf, mcs_set[i] >> 4); + } + mcs_set += 3; - mcs_set += 3; - if (band == NL80211_BAND_6GHZ && (phy_cap[0] & BIT(1))) { - for (i = 0; i < 3; i++) - printf("%s\t\tEHT bw=320 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", - pre, mcs[i + 1], - mcs_set[i] & 0xf, mcs_set[i] >> 4); + if (he_phy_cap[0] & (BIT(3) << 8)) { + for (i = 0; i < 3; i++) + printf("%s\t\tEHT bw=160 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", + pre, mcs[i + 1], + mcs_set[i] & 0xf, mcs_set[i] >> 4); + } + mcs_set += 3; + if (band == NL80211_BAND_6GHZ && (phy_cap[0] & BIT(1))) { + for (i = 0; i < 3; i++) + printf("%s\t\tEHT bw=320 MHz, max NSS for MCS %s: Rx=%u, Tx=%u\n", + pre, mcs[i + 1], + mcs_set[i] & 0xf, mcs_set[i] >> 4); + } } if (ppet && ppet_len && (phy_cap[1] & BIT(11))) { |