Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

iwmon: print HE capabilities element

Browse Source 
Adds a handler for the HE capabilities element and reworks the way
the MCS/NSS support bits are printed.

Now if the MCS support is 3 (unsupported) it won't be printed. This
makes the logs a bit shorter to read.
This commit is contained in:
James Prestwood 2023-10-16 07:42:48 -07:00 committed by Denis Kenzior
parent f780f73f75
commit 96587f3c8c
1 changed files with 86 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
monitor/nlmon.c
View File

@ -1394,31 +1394,22 @@ static void print_ie_ht_operation(unsigned int level, const char *label,
} }
static void print_spatial_stream_map(unsigned int level, const char *label, static void print_spatial_stream_map(unsigned int level, const char *label,
const uint8_t *map) const uint8_t *map,
const char **stream_map)
{ {
static const char *spatial_streams[] = { unsigned int i;
"0 - MCS 0-7 supported", unsigned int j = 0;
"1 - MCS 0-8 supported",
"2 - MCS 0-9 supported",
"3 - No MCS support",
};
print_attr(level + 1, "%s 1 Streams: %s", label, for (i = 0; i < 8; i++, j += 2) {
spatial_streams[bit_field(map[0], 0, 2)]); unsigned int byte = (i < 4) ? 0 : 1;
print_attr(level + 1, "%s 2 Streams: %s", label, uint8_t field = bit_field(map[byte], j % 8, 2);
spatial_streams[bit_field(map[0], 2, 2)]);
print_attr(level + 1, "%s 3 Streams: %s", label, if (field == 3)
spatial_streams[bit_field(map[0], 4, 2)]); continue;
print_attr(level + 1, "%s 4 Streams: %s", label,
spatial_streams[bit_field(map[0], 6, 2)]); print_attr(level + 1, "%s %u Streams: %s", label, i + 1,
print_attr(level + 1, "%s 5 Streams: %s", label, stream_map[field]);
spatial_streams[bit_field(map[1], 0, 2)]); }
print_attr(level + 1, "%s 6 Streams: %s", label,
spatial_streams[bit_field(map[1], 2, 2)]);
print_attr(level + 1, "%s 7 Streams: %s", label,
spatial_streams[bit_field(map[1], 4, 2)]);
print_attr(level + 1, "%s 8 Streams: %s", label,
spatial_streams[bit_field(map[1], 6, 2)]);
} }
static void print_ie_vht_operation(unsigned int level, const char *label, static void print_ie_vht_operation(unsigned int level, const char *label,
@ -1430,6 +1421,13 @@ static void print_ie_vht_operation(unsigned int level, const char *label,
"2 - 160 Mhz", "2 - 160 Mhz",
"3 - 80+80 Mhz", "3 - 80+80 Mhz",
}; };
static const char *spatial_streams[] = {
"MCS 0-7 supported",
"MCS 0-8 supported",
"MCS 0-9 supported",
};
uint8_t *bytes = (uint8_t *) data; uint8_t *bytes = (uint8_t *) data;
if (size < 5) { if (size < 5) {
@ -1443,7 +1441,8 @@ static void print_ie_vht_operation(unsigned int level, const char *label,
print_attr(level + 1, "Channel Center Frequency 1: %d", bytes[1]); print_attr(level + 1, "Channel Center Frequency 1: %d", bytes[1]);
print_attr(level + 1, "Channel Center Frequency 2: %d", bytes[2]); print_attr(level + 1, "Channel Center Frequency 2: %d", bytes[2]);
print_spatial_stream_map(level + 1, "Basic VHT-MCS", bytes + 3); print_spatial_stream_map(level + 1, "Basic VHT-MCS", bytes + 3,
spatial_streams);
} }
static const char *extended_capabilities_bitfield[80] = { static const char *extended_capabilities_bitfield[80] = {
@ -1656,6 +1655,13 @@ static void print_ie_vht_capabilities(unsigned int level,
[29] = "TX Antenna Pattern Consistency", [29] = "TX Antenna Pattern Consistency",
[30 ... 31] = "Extended NSS BW Support", [30 ... 31] = "Extended NSS BW Support",
}; };
static const char *spatial_streams[] = {
"MCS 0-7 supported",
"MCS 0-8 supported",
"MCS 0-9 supported",
};
uint8_t info_mask[] = { 0xf0, 0x18, 0x78, 0x30 }; uint8_t info_mask[] = { 0xf0, 0x18, 0x78, 0x30 };
print_attr(level, "%s: len %u", label, size); print_attr(level, "%s: len %u", label, size);
@ -1666,16 +1672,68 @@ static void print_ie_vht_capabilities(unsigned int level,
print_ie_bitfield(level + 1, "VHT Capabilities Info", data, info_mask, print_ie_bitfield(level + 1, "VHT Capabilities Info", data, info_mask,
4, vht_capabilities_info_bitfield); 4, vht_capabilities_info_bitfield);
print_spatial_stream_map(level + 1, "RxVHT-MCS", data + 4); print_spatial_stream_map(level + 1, "RxVHT-MCS", data + 4,
spatial_streams);
print_attr(level + 1, "Rx Highest Supported Long GI Data Rate: %d", print_attr(level + 1, "Rx Highest Supported Long GI Data Rate: %d",
l_get_le16(data + 6) & 0x1f); l_get_le16(data + 6) & 0x1f);
print_spatial_stream_map(level + 1, "TxVHT-MCS", data + 8); print_spatial_stream_map(level + 1, "TxVHT-MCS", data + 8,
spatial_streams);
print_attr(level + 1, "Tx Highest Supported Long GI Data Rate: %d", print_attr(level + 1, "Tx Highest Supported Long GI Data Rate: %d",
l_get_le16(data + 10) & 0x1f); l_get_le16(data + 10) & 0x1f);
if (test_bit(data + 4, 61)) if (test_bit(data + 4, 61))
print_attr(level + 1, "VHT Extended NSS BW Capable"); print_attr(level + 1, "VHT Extended NSS BW Capable");
} }
static void print_ie_he_capabilities(unsigned int level,
const char *label,
const void *data, uint16_t size)
{
const uint8_t *ptr = data;
uint8_t width_set = bit_field((ptr + 6)[0], 1, 7);
uint8_t mask = 0xff;
const char *he_channel_width_bitfield[] = {
[0] = "40MHz supported (2.4GHz)",
[1] = "40MHz/80MHz supported (5GHz/6GHz)",
[2] = "160MHz supported (5GHz/6GHz)",
[3] = "160MHz/80+80MHz supported (5GHz/6GHz)",
[4] = "242-tone RUs (2.4GHz)",
[5] = "242-tone RUs (5GHz/6GHz)",
};
static const char *spatial_streams[] = {
"MCS 0-7 supported",
"MCS 0-9 supported",
"MCS 0-11 supported",
};
print_attr(level, "%s: len %u", label, size);
print_ie_bitfield(level + 1, "HE supported channel width set",
&width_set, &mask, 1, he_channel_width_bitfield);
if (test_bit(&width_set, 1) || test_bit(&width_set, 0)) {
print_spatial_stream_map(level + 1, "Rx HE-MCS Map <= 80MHz",
data + 17, spatial_streams);
print_spatial_stream_map(level + 1, "Tx HE-MCS Map <= 80MHz",
data + 19, spatial_streams);
}
if (test_bit(&width_set, 2)) {
print_spatial_stream_map(level + 1, "Rx HE-MCS Map 160MHz",
data + 21, spatial_streams);
print_spatial_stream_map(level + 1, "Tx HE-MCS Map 160MHz",
data + 23, spatial_streams);
}
if (test_bit(&width_set, 3)) {
print_spatial_stream_map(level + 1, "Rx HE-MCS Map 80+80MHz",
data + 25, spatial_streams);
print_spatial_stream_map(level + 1, "Tx HE-MCS Map 80+80MHz",
data + 27, spatial_streams);
}
}
static void print_ie_rm_enabled_caps(unsigned int level, static void print_ie_rm_enabled_caps(unsigned int level,
const char *label, const char *label,
const void *data, uint16_t size) const void *data, uint16_t size)
@ -2430,6 +2488,8 @@ static struct attr_entry ie_entry[] = {
ATTR_CUSTOM, { .function = print_ie_ht_capabilities } }, ATTR_CUSTOM, { .function = print_ie_ht_capabilities } },
{ IE_TYPE_VHT_CAPABILITIES, "VHT Capabilities", { IE_TYPE_VHT_CAPABILITIES, "VHT Capabilities",
ATTR_CUSTOM, { .function = print_ie_vht_capabilities } }, ATTR_CUSTOM, { .function = print_ie_vht_capabilities } },
{ IE_TYPE_HE_CAPABILITIES, "HE Capabilities",
ATTR_CUSTOM, { .function = print_ie_he_capabilities } },
{ IE_TYPE_RM_ENABLED_CAPABILITIES, "RM Enabled Capabilities", { IE_TYPE_RM_ENABLED_CAPABILITIES, "RM Enabled Capabilities",
ATTR_CUSTOM, { .function = print_ie_rm_enabled_caps } }, ATTR_CUSTOM, { .function = print_ie_rm_enabled_caps } },
{ IE_TYPE_INTERWORKING, "Interworking", { IE_TYPE_INTERWORKING, "Interworking",