DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Clean up VHT override max A-MPDU override calculation

Browse source 
There is no need to use runtime call to find_first_bit() to determine
shift amount for a constant integer.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-14 18:44:10 +02:00
parent 2797486c4f
commit b0f33467a5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/ieee802_11_defs.h
View file

@ -833,6 +833,7 @@ struct ieee80211_ampe_ie {
#define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_6 ((u32) BIT(24) | BIT(25)) #define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_6 ((u32) BIT(24) | BIT(25))
#define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX ((u32) BIT(23) | \ #define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX ((u32) BIT(23) | \
BIT(24) | BIT(25)) BIT(24) | BIT(25))
#define VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX_SHIFT 23
#define VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB ((u32) BIT(27)) #define VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB ((u32) BIT(27))
#define VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB ((u32) BIT(26) | BIT(27)) #define VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB ((u32) BIT(26) | BIT(27))
#define VHT_CAP_RX_ANTENNA_PATTERN ((u32) BIT(28)) #define VHT_CAP_RX_ANTENNA_PATTERN ((u32) BIT(28))

13
wpa_supplicant/wpa_supplicant.c
View file

@ -3204,10 +3204,6 @@ void wpa_supplicant_apply_vht_overrides(
{ {
struct ieee80211_vht_capabilities *vhtcaps; struct ieee80211_vht_capabilities *vhtcaps;
struct ieee80211_vht_capabilities *vhtcaps_mask; struct ieee80211_vht_capabilities *vhtcaps_mask;
#ifdef CONFIG_HT_OVERRIDES
int max_ampdu;
const u32 max_ampdu_mask = VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX;
#endif /* CONFIG_HT_OVERRIDES */
if (!ssid) if (!ssid)
return; return;
@ -3225,9 +3221,12 @@ void wpa_supplicant_apply_vht_overrides(
#ifdef CONFIG_HT_OVERRIDES #ifdef CONFIG_HT_OVERRIDES
/* if max ampdu is <= 3, we have to make the HT cap the same */ /* if max ampdu is <= 3, we have to make the HT cap the same */
if (ssid->vht_capa_mask & max_ampdu_mask) { if (ssid->vht_capa_mask & VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX) {
max_ampdu = (ssid->vht_capa & max_ampdu_mask) >> int max_ampdu;
find_first_bit(max_ampdu_mask);
max_ampdu = (ssid->vht_capa &
VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX) >>
VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MAX_SHIFT;
max_ampdu = max_ampdu < 3 ? max_ampdu : 3; max_ampdu = max_ampdu < 3 ? max_ampdu : 3;
wpa_set_ampdu_factor(wpa_s, wpa_set_ampdu_factor(wpa_s,