fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 18:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: rename ieee80211_eid capability defines

Browse source 
IEEE_80211_IE_VHT_CAP has zero hits searching the internet.
WLAN_EID_VHT_CAPABILITY is how the same define is called by
kernel's "include/linux/ieee80211.h".

Use the same name as kernel.

Also, collect the maximum of @max_rate.
This commit is contained in:
Thomas Haller 2017-03-09 23:42:21 +01:00 • committed by Beniamino Galvani
parent 0c6097ccbe
commit 961d572472
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/wifi/nm-wifi-ap.c
View file

@ -680,8 +680,9 @@ get_max_rate_vht (guint32 vht_cap, guint16 tx_map)
return 0;
}
#define IEEE_80211_IE_HT_CAP 45
#define IEEE_80211_IE_VHT_CAP 191
/* Management Frame Information Element IDs, ieee80211_eid */
#define WLAN_EID_HT_CAPABILITY 45
#define WLAN_EID_VHT_CAPABILITY 191
static guint32
get_max_rate (const guint8 *bytes, gsize len)
@ -700,11 +701,14 @@ get_max_rate (const guint8 *bytes, gsize len)
if (elem_len > len)
return 0;
if (id == IEEE_80211_IE_HT_CAP)
max_rate = get_max_rate_ht (*bytes, bytes+3);
if (id == IEEE_80211_IE_VHT_CAP)
max_rate = get_max_rate_vht (*bytes, *(bytes+8));
switch (id) {
case WLAN_EID_HT_CAPABILITY:
max_rate = NM_MAX (max_rate, get_max_rate_ht (*bytes, bytes+3));
break;
case WLAN_EID_VHT_CAPABILITY:
max_rate = NM_MAX (max_rate, get_max_rate_vht (*bytes, *(bytes+8)));
break;
}
len -= elem_len;
bytes += elem_len;