redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8723au: Use kernel provided WLAN_CAPABILITY_* definitions

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-05-21 09:37:46 +02:00 committed by Greg Kroah-Hartman
parent e80c2859b1
commit e1c04628f7
3 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/rtl8723au/core/rtw_ieee80211.c
View file

@ -402,13 +402,13 @@ int rtw_generate_ie23a(struct registry_priv *pregistrypriv)
/* capability info */
*(u16*)ie = 0;
*(u16*)ie |= cpu_to_le16(cap_IBSS);
*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_IBSS);
if (pregistrypriv->preamble == PREAMBLE_SHORT)
*(u16*)ie |= cpu_to_le16(cap_ShortPremble);
*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
if (pdev_network->Privacy)
*(u16*)ie |= cpu_to_le16(cap_Privacy);
*(u16*)ie |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
sz += 2;
ie += 2;

7
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View file

@ -4652,7 +4652,7 @@ void start_create_ibss23a(struct rtw_adapter* padapter)
/* udpate capability */
caps = rtw_get_capability23a(pnetwork);
update_capinfo23a(padapter, caps);
if (caps&cap_IBSS) { /* adhoc master */
if (caps & WLAN_CAPABILITY_IBSS) { /* adhoc master */
rtl8723a_set_sec_cfg(padapter, 0xcf);
/* switch channel */
@ -4707,7 +4707,7 @@ void start_clnt_join23a(struct rtw_adapter* padapter)
/* udpate capability */
caps = rtw_get_capability23a(pnetwork);
update_capinfo23a(padapter, caps);
if (caps&cap_ESS) {
if (caps & WLAN_CAPABILITY_ESS) {
/* switch channel */
set_channel_bwmode23a(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
@ -4728,8 +4728,7 @@ void start_clnt_join23a(struct rtw_adapter* padapter)
mod_timer(&padapter->mlmepriv.assoc_timer, jiffies +
msecs_to_jiffies((REAUTH_TO * REAUTH_LIMIT) + (REASSOC_TO*REASSOC_LIMIT) + beacon_timeout));
pmlmeinfo->state = WIFI_FW_AUTH_NULL | WIFI_FW_STATION_STATE;
}
else if (caps&cap_IBSS) { /* adhoc client */
} else if (caps & WLAN_CAPABILITY_IBSS) { /* adhoc client */
Set_MSR23a(padapter, WIFI_FW_ADHOC_STATE);
rtl8723a_set_sec_cfg(padapter, 0xcf);

12
drivers/staging/rtl8723au/include/wifi.h
View file

@ -164,18 +164,6 @@ enum WIFI_REG_DOMAIN {
#define _STATUS_CODE_ 2
#define _TIMESTAMP_ 8
#define cap_ESS BIT(0)
#define cap_IBSS BIT(1)
#define cap_CFPollable BIT(2)
#define cap_CFRequest BIT(3)
#define cap_Privacy BIT(4)
#define cap_ShortPremble BIT(5)
#define cap_PBCC BIT(6)
#define cap_ChAgility BIT(7)
#define cap_SpecMgmt BIT(8)
#define cap_QoS BIT(9)
#define cap_ShortSlot BIT(10)
/*-----------------------------------------------------------------------------
Below is the definition for WMM
------------------------------------------------------------------------------*/