staging: rtl8188eu: use common ieee80211 constants
PATCH 1/1 staging: rtl8188eu: use common ieee80211 constants
Many defined constants in wifi.h are unused and/or available from <linux/ieee80211.h>, some with slightly different names. Use the common ones, rename where necessary and remove unused.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 12 ++--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 6 +-- drivers/staging/rtl8188eu/include/wifi.h | 46 ------------------- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- 4 files changed, 10 insertions(+), 56 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +6 -6
@@ -535,7 +535,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)/* bwmode */ if (le16_to_cpu (phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & -IEEE80211_HT_CAP_SUP_WIDTH ) { +IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) { phtpriv_sta->bwmode = pmlmeext->cur_bwmode; phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset; }
@@ -925,12 +925,12 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if ((psecuritypriv->wpa_pairwise_cipher &WPA_CIPHER_CCMP ) || (psecuritypriv->wpa2_pairwise_cipher &WPA_CIPHER_CCMP )) - pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 <<2 )); + pht_cap->ampdu_params_info |= (IEEE80211_HT_AMPDU_PARM_DENSITY & (0x07 <<2 ));else - pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); + pht_cap->ampdu_params_info |= (IEEE80211_HT_AMPDU_PARM_DENSITY &0x00 );/* set Max Rx AMPDU size to 64K */ - pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR &0x03 ); + pht_cap->ampdu_params_info |= (IEEE80211_HT_AMPDU_PARM_FACTOR &0x03 ); pht_cap->mcs.rx_mask[0 ] =0xff ; pht_cap->mcs.rx_mask[1 ] =0x0 ;
@@ -1307,7 +1307,7 @@ static int rtw_ht_operation_update(struct adapter *padapter) (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)) new_op_mode =OP_MODE_MIXED ; else if ((le16_to_cpu(phtpriv_ap->ht_cap.cap_info) & - IEEE80211_HT_CAP_SUP_WIDTH) && + IEEE80211_HT_CAP_SUP_WIDTH_20_40) && pmlmepriv->num_sta_ht_20mhz) new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED; else if (pmlmepriv->olbc_ht)
@@ -1457,7 +1457,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_ht_no_gf); } -if ((ht_capab &IEEE80211_HT_CAP_SUP_WIDTH ) ==0 ) { +if ((ht_capab &IEEE80211_HT_CAP_SUP_WIDTH_20_40 ) ==0 ) {if (!psta->ht_20mhz_set) { psta->ht_20mhz_set =1 ; pmlmepriv->num_sta_ht_20mhz++;
drivers/staging/rtl8188eu/core/rtw_mlme.c +3 -3
@@ -1882,7 +1882,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_memset (&ht_cap,0 ,sizeof (struct ieee80211_ht_cap )); - ht_cap.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH | + ht_cap.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_TX_STBC |
@@ -1900,9 +1900,9 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ ht_cap.ampdu_params_info = max_rx_ampdu_factor &0x03 ;if (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_) - ht_cap.ampdu_params_info |=IEEE80211_HT_CAP_AMPDU_DENSITY & (0x07 <<2 ); + ht_cap.ampdu_params_info |=IEEE80211_HT_AMPDU_PARM_DENSITY & (0x07 <<2 );else - ht_cap.ampdu_params_info |=IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ; + ht_cap.ampdu_params_info |=IEEE80211_HT_AMPDU_PARM_DENSITY &0x00 ; rtw_set_ie(out_ie + out_len, _HT_CAPABILITY_IE_, sizeof(struct ieee80211_ht_cap),
drivers/staging/rtl8188eu/include/wifi.h +0 -46
52 lines not on this page · raw message
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -129,7 +129,7 @@ static char *translate_scan(struct adapter *padapter, pht_capie = (struct ieee80211_ht_cap *)(p +2 );memcpy (&mcs_rate, pht_capie->mcs.rx_mask,2 ); bw_40MHz = !!(le16_to_cpu (pht_capie->cap_info) & -IEEE80211_HT_CAP_SUP_WIDTH ); +IEEE80211_HT_CAP_SUP_WIDTH_20_40 ); short_GI = !!(le16_to_cpu (pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_SGI_40 ));
Signature · 1 line
2.27.0