diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-21 09:37:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 16:27:44 +0900 |
| commit | e1c04628f70bdb1a6ad8ba270f67ef4ab2aa4a43 (patch) | |
| tree | e21b0e0afed5e4d9278f68ee870da6e302eb84c4 | |
| parent | e80c2859b16fbfe209e7ee7cf2b2b65deb890971 (diff) | |
| download | blackbird-obmc-linux-e1c04628f70bdb1a6ad8ba270f67ef4ab2aa4a43.tar.gz blackbird-obmc-linux-e1c04628f70bdb1a6ad8ba270f67ef4ab2aa4a43.zip | |
staging: rtl8723au: Use kernel provided WLAN_CAPABILITY_* definitions
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_ieee80211.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/wifi.h | 12 |
3 files changed, 6 insertions, 19 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c index 9ee05df39976..28a7a0c81166 100644 --- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c @@ -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; diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index 951fbab1144c..d3d192d9a272 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -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); diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h index 4a84d0c72afb..149564f92c80 100644 --- a/drivers/staging/rtl8723au/include/wifi.h +++ b/drivers/staging/rtl8723au/include/wifi.h @@ -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 ------------------------------------------------------------------------------*/ |
