staging: brcm80211: replaced some ieee80211 preprocessor constants part 2
Code cleanup. Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
3726ed4d55
commit
04795017b7
|
@ -607,14 +607,14 @@ wl_iw_get_range(struct net_device *dev,
|
|||
|
||||
range->max_encoding_tokens = DOT11_MAX_DEFAULT_KEYS;
|
||||
range->num_encoding_sizes = 4;
|
||||
range->encoding_size[0] = WEP1_KEY_SIZE;
|
||||
range->encoding_size[1] = WEP128_KEY_SIZE;
|
||||
range->encoding_size[0] = WLAN_KEY_LEN_WEP40;
|
||||
range->encoding_size[1] = WLAN_KEY_LEN_WEP104;
|
||||
#if WIRELESS_EXT > 17
|
||||
range->encoding_size[2] = TKIP_KEY_SIZE;
|
||||
range->encoding_size[2] = WLAN_KEY_LEN_TKIP;
|
||||
#else
|
||||
range->encoding_size[2] = 0;
|
||||
#endif
|
||||
range->encoding_size[3] = AES_KEY_SIZE;
|
||||
range->encoding_size[3] = WLAN_KEY_LEN_AES_CMAC;
|
||||
|
||||
range->min_pmp = 0;
|
||||
range->max_pmp = 0;
|
||||
|
@ -909,7 +909,7 @@ wl_iw_get_aplist(struct net_device *dev,
|
|||
ASSERT(((unsigned long)bi + dtoh32(bi->length)) <=
|
||||
((unsigned long)list + buflen));
|
||||
|
||||
if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
|
||||
if (!(dtoh16(bi->capability) & WLAN_CAPABILITY_ESS))
|
||||
continue;
|
||||
|
||||
memcpy(addr[dwrq->length].sa_data, &bi->BSSID, ETH_ALEN);
|
||||
|
@ -981,7 +981,7 @@ wl_iw_iscan_get_aplist(struct net_device *dev,
|
|||
ASSERT(((unsigned long)bi + dtoh32(bi->length)) <=
|
||||
((unsigned long)list + WLC_IW_ISCAN_MAXLEN));
|
||||
|
||||
if (!(dtoh16(bi->capability) & DOT11_CAP_ESS))
|
||||
if (!(dtoh16(bi->capability) & WLAN_CAPABILITY_ESS))
|
||||
continue;
|
||||
|
||||
memcpy(addr[dwrq->length].sa_data, &bi->BSSID,
|
||||
|
@ -1522,9 +1522,10 @@ wl_iw_get_scan_prep(wl_scan_results_t *list,
|
|||
iwe.u.data.flags = 1;
|
||||
event = IWE_STREAM_ADD_POINT(info, event, end, &iwe, bi->SSID);
|
||||
|
||||
if (dtoh16(bi->capability) & (DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
|
||||
if (dtoh16(bi->capability) & (WLAN_CAPABILITY_ESS |
|
||||
WLAN_CAPABILITY_IBSS)) {
|
||||
iwe.cmd = SIOCGIWMODE;
|
||||
if (dtoh16(bi->capability) & DOT11_CAP_ESS)
|
||||
if (dtoh16(bi->capability) & WLAN_CAPABILITY_ESS)
|
||||
iwe.u.mode = IW_MODE_INFRA;
|
||||
else
|
||||
iwe.u.mode = IW_MODE_ADHOC;
|
||||
|
@ -1559,7 +1560,7 @@ wl_iw_get_scan_prep(wl_scan_results_t *list,
|
|||
wl_iw_handle_scanresults_ies(&event, end, info, bi);
|
||||
|
||||
iwe.cmd = SIOCGIWENCODE;
|
||||
if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
|
||||
if (dtoh16(bi->capability) & WLAN_CAPABILITY_PRIVACY)
|
||||
iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
|
||||
else
|
||||
iwe.u.data.flags = IW_ENCODE_DISABLED;
|
||||
|
@ -1800,9 +1801,10 @@ wl_iw_iscan_get_scan(struct net_device *dev,
|
|||
bi->SSID);
|
||||
|
||||
if (dtoh16(bi->capability) &
|
||||
(DOT11_CAP_ESS | DOT11_CAP_IBSS)) {
|
||||
(WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
|
||||
iwe.cmd = SIOCGIWMODE;
|
||||
if (dtoh16(bi->capability) & DOT11_CAP_ESS)
|
||||
if (dtoh16(bi->capability) &
|
||||
WLAN_CAPABILITY_ESS)
|
||||
iwe.u.mode = IW_MODE_INFRA;
|
||||
else
|
||||
iwe.u.mode = IW_MODE_ADHOC;
|
||||
|
@ -1840,7 +1842,7 @@ wl_iw_iscan_get_scan(struct net_device *dev,
|
|||
wl_iw_handle_scanresults_ies(&event, end, info, bi);
|
||||
|
||||
iwe.cmd = SIOCGIWENCODE;
|
||||
if (dtoh16(bi->capability) & DOT11_CAP_PRIVACY)
|
||||
if (dtoh16(bi->capability) & WLAN_CAPABILITY_PRIVACY)
|
||||
iwe.u.data.flags =
|
||||
IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
|
||||
else
|
||||
|
@ -2361,16 +2363,16 @@ wl_iw_set_encode(struct net_device *dev,
|
|||
|
||||
key.flags = WL_PRIMARY_KEY;
|
||||
switch (key.len) {
|
||||
case WEP1_KEY_SIZE:
|
||||
case WLAN_KEY_LEN_WEP40:
|
||||
key.algo = CRYPTO_ALGO_WEP1;
|
||||
break;
|
||||
case WEP128_KEY_SIZE:
|
||||
case WLAN_KEY_LEN_WEP104:
|
||||
key.algo = CRYPTO_ALGO_WEP128;
|
||||
break;
|
||||
case TKIP_KEY_SIZE:
|
||||
case WLAN_KEY_LEN_TKIP:
|
||||
key.algo = CRYPTO_ALGO_TKIP;
|
||||
break;
|
||||
case AES_KEY_SIZE:
|
||||
case WLAN_KEY_LEN_AES_CMAC:
|
||||
key.algo = CRYPTO_ALGO_AES_CCM;
|
||||
break;
|
||||
default:
|
||||
|
@ -2602,7 +2604,7 @@ wl_iw_set_encodeext(struct net_device *dev,
|
|||
key.algo = CRYPTO_ALGO_OFF;
|
||||
break;
|
||||
case IW_ENCODE_ALG_WEP:
|
||||
if (iwe->key_len == WEP1_KEY_SIZE)
|
||||
if (iwe->key_len == WLAN_KEY_LEN_WEP40)
|
||||
key.algo = CRYPTO_ALGO_WEP1;
|
||||
else
|
||||
key.algo = CRYPTO_ALGO_WEP128;
|
||||
|
|
|
@ -168,12 +168,6 @@ typedef struct wme_param_ie wme_param_ie_t;
|
|||
#define DOT11_MNG_WPA_ID 221
|
||||
#define DOT11_MNG_VS_ID 221
|
||||
|
||||
#define DOT11_CAP_ESS 0x0001
|
||||
#define DOT11_CAP_IBSS 0x0002
|
||||
#define DOT11_CAP_PRIVACY 0x0010
|
||||
#define DOT11_CAP_SHORT 0x0020
|
||||
#define DOT11_CAP_SHORTSLOT 0x0400
|
||||
|
||||
#define DOT11_BSSTYPE_INFRASTRUCTURE 0
|
||||
#define DOT11_BSSTYPE_ANY 2
|
||||
#define DOT11_SCANTYPE_ACTIVE 0
|
||||
|
@ -235,21 +229,12 @@ typedef struct ht_cap_ie ht_cap_ie_t;
|
|||
|
||||
#define HT_CAP_IE_LEN 26
|
||||
|
||||
#define HT_CAP_LDPC_CODING 0x0001
|
||||
#define HT_CAP_40MHZ 0x0002
|
||||
#define HT_CAP_MIMO_PS_MASK 0x000C
|
||||
#define HT_CAP_MIMO_PS_SHIFT 0x0002
|
||||
#define HT_CAP_MIMO_PS_OFF 0x0003
|
||||
#define HT_CAP_MIMO_PS_ON 0x0000
|
||||
#define HT_CAP_GF 0x0010
|
||||
#define HT_CAP_SHORT_GI_20 0x0020
|
||||
#define HT_CAP_SHORT_GI_40 0x0040
|
||||
#define HT_CAP_TX_STBC 0x0080
|
||||
#define HT_CAP_RX_STBC_MASK 0x0300
|
||||
#define HT_CAP_RX_STBC_SHIFT 8
|
||||
#define HT_CAP_MAX_AMSDU 0x0800
|
||||
#define HT_CAP_DSSS_CCK 0x1000
|
||||
#define HT_CAP_40MHZ_INTOLERANT 0x4000
|
||||
|
||||
#define HT_CAP_RX_STBC_NO 0x0
|
||||
#define HT_CAP_RX_STBC_ONE_STREAM 0x1
|
||||
|
@ -281,11 +266,6 @@ typedef struct ht_cap_ie ht_cap_ie_t;
|
|||
#define DOT11_MAX_KEY_SIZE 32
|
||||
#define DOT11_WPA_KEY_RSC_LEN 8
|
||||
|
||||
#define WEP1_KEY_SIZE 5
|
||||
#define WEP128_KEY_SIZE 13
|
||||
#define TKIP_KEY_SIZE 32
|
||||
#define AES_KEY_SIZE 16
|
||||
|
||||
#define BRCM_OUI "\x00\x10\x18"
|
||||
|
||||
#endif /* _802_11_H_ */
|
||||
|
|
|
@ -737,9 +737,11 @@ void wlc_switch_shortslot(struct wlc_info *wlc, bool shortslot)
|
|||
FOREACH_BSS(wlc, idx, cfg) {
|
||||
if (!cfg->associated)
|
||||
continue;
|
||||
cfg->current_bss->capability &= ~DOT11_CAP_SHORTSLOT;
|
||||
cfg->current_bss->capability &=
|
||||
~WLAN_CAPABILITY_SHORT_SLOT_TIME;
|
||||
if (wlc->shortslot)
|
||||
cfg->current_bss->capability |= DOT11_CAP_SHORTSLOT;
|
||||
cfg->current_bss->capability |=
|
||||
WLAN_CAPABILITY_SHORT_SLOT_TIME;
|
||||
}
|
||||
|
||||
wlc_bmac_set_shortslot(wlc->hw, shortslot);
|
||||
|
@ -1178,9 +1180,9 @@ void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val)
|
|||
|
||||
static void wlc_ht_update_sgi_rx(struct wlc_info *wlc, int val)
|
||||
{
|
||||
wlc->ht_cap.cap &= ~(HT_CAP_SHORT_GI_20 | HT_CAP_SHORT_GI_40);
|
||||
wlc->ht_cap.cap |= (val & WLC_N_SGI_20) ? HT_CAP_SHORT_GI_20 : 0;
|
||||
wlc->ht_cap.cap |= (val & WLC_N_SGI_40) ? HT_CAP_SHORT_GI_40 : 0;
|
||||
wlc->ht_cap.cap &= ~(IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40);
|
||||
wlc->ht_cap.cap |= (val & WLC_N_SGI_20) ? IEEE80211_HT_CAP_SGI_20 : 0;
|
||||
wlc->ht_cap.cap |= (val & WLC_N_SGI_40) ? IEEE80211_HT_CAP_SGI_40 : 0;
|
||||
|
||||
if (wlc->pub->up) {
|
||||
wlc_update_beacon(wlc);
|
||||
|
@ -1192,9 +1194,9 @@ static void wlc_ht_update_ldpc(struct wlc_info *wlc, s8 val)
|
|||
{
|
||||
wlc->stf->ldpc = val;
|
||||
|
||||
wlc->ht_cap.cap &= ~HT_CAP_LDPC_CODING;
|
||||
wlc->ht_cap.cap &= ~IEEE80211_HT_CAP_LDPC_CODING;
|
||||
if (wlc->stf->ldpc != OFF)
|
||||
wlc->ht_cap.cap |= HT_CAP_LDPC_CODING;
|
||||
wlc->ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;
|
||||
|
||||
if (wlc->pub->up) {
|
||||
wlc_update_beacon(wlc);
|
||||
|
@ -1987,14 +1989,14 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
|
|||
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_TX) {
|
||||
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = OFF;
|
||||
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = OFF;
|
||||
wlc->ht_cap.cap &= ~HT_CAP_TX_STBC;
|
||||
wlc->ht_cap.cap &= ~IEEE80211_HT_CAP_TX_STBC;
|
||||
}
|
||||
if (n_disabled & WLFEATURE_DISABLE_11N_STBC_RX)
|
||||
wlc_stf_stbc_rx_set(wlc, HT_CAP_RX_STBC_NO);
|
||||
|
||||
/* apply the GF override from nvram conf */
|
||||
if (n_disabled & WLFEATURE_DISABLE_11N_GF)
|
||||
wlc->ht_cap.cap &= ~HT_CAP_GF;
|
||||
wlc->ht_cap.cap &= ~IEEE80211_HT_CAP_GRN_FLD;
|
||||
|
||||
/* initialize radio_mpc_disable according to wlc->mpc */
|
||||
wlc_radio_mpc_upd(wlc);
|
||||
|
@ -2872,16 +2874,17 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
|
|||
|
||||
if ((AP_ENAB(wlc->pub) && preamble != WLC_PLCP_LONG)
|
||||
|| preamble == WLC_PLCP_SHORT)
|
||||
wlc->default_bss->capability |= DOT11_CAP_SHORT;
|
||||
wlc->default_bss->capability |= WLAN_CAPABILITY_SHORT_PREAMBLE;
|
||||
else
|
||||
wlc->default_bss->capability &= ~DOT11_CAP_SHORT;
|
||||
wlc->default_bss->capability &= ~WLAN_CAPABILITY_SHORT_PREAMBLE;
|
||||
|
||||
/* Update shortslot capability bit for AP and IBSS */
|
||||
if ((AP_ENAB(wlc->pub) && shortslot == WLC_SHORTSLOT_AUTO) ||
|
||||
shortslot == WLC_SHORTSLOT_ON)
|
||||
wlc->default_bss->capability |= DOT11_CAP_SHORTSLOT;
|
||||
wlc->default_bss->capability |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
|
||||
else
|
||||
wlc->default_bss->capability &= ~DOT11_CAP_SHORTSLOT;
|
||||
wlc->default_bss->capability &=
|
||||
~WLAN_CAPABILITY_SHORT_SLOT_TIME;
|
||||
|
||||
/* Use the default 11g rateset */
|
||||
if (!rs.count)
|
||||
|
@ -8280,7 +8283,7 @@ void wlc_reset_bmac_done(struct wlc_info *wlc)
|
|||
void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode)
|
||||
{
|
||||
wlc->ht_cap.cap &= ~HT_CAP_MIMO_PS_MASK;
|
||||
wlc->ht_cap.cap |= (mimops_mode << HT_CAP_MIMO_PS_SHIFT);
|
||||
wlc->ht_cap.cap |= (mimops_mode << IEEE80211_HT_CAP_SM_PS_SHIFT);
|
||||
|
||||
if (AP_ENAB(wlc->pub) && wlc->clk) {
|
||||
wlc_update_beacon(wlc);
|
||||
|
|
|
@ -145,8 +145,9 @@ struct rsn_parms {
|
|||
#define AMPDU_DEF_MPDU_DENSITY 6 /* default mpdu density (110 ==> 4us) */
|
||||
|
||||
/* defaults for the HT (MIMO) bss */
|
||||
#define HT_CAP ((HT_CAP_MIMO_PS_OFF << HT_CAP_MIMO_PS_SHIFT) | HT_CAP_40MHZ | \
|
||||
HT_CAP_GF | HT_CAP_MAX_AMSDU | HT_CAP_DSSS_CCK)
|
||||
#define HT_CAP ((HT_CAP_MIMO_PS_OFF << IEEE80211_HT_CAP_SM_PS_SHIFT) |\
|
||||
IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_GRN_FLD |\
|
||||
HT_CAP_MAX_AMSDU | IEEE80211_HT_CAP_DSSSCCK40)
|
||||
|
||||
/* WLC packet type is a void * */
|
||||
typedef void *wlc_pkt_t;
|
||||
|
|
|
@ -167,9 +167,9 @@ static bool wlc_stf_stbc_tx_set(struct wlc_info *wlc, s32 int_val)
|
|||
|
||||
if ((int_val == OFF) || (wlc->stf->txstreams == 1)
|
||||
|| !WLC_STBC_CAP_PHY(wlc))
|
||||
wlc->ht_cap.cap &= ~HT_CAP_TX_STBC;
|
||||
wlc->ht_cap.cap &= ~IEEE80211_HT_CAP_TX_STBC;
|
||||
else
|
||||
wlc->ht_cap.cap |= HT_CAP_TX_STBC;
|
||||
wlc->ht_cap.cap |= IEEE80211_HT_CAP_TX_STBC;
|
||||
|
||||
wlc->bandstate[BAND_2G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
||||
wlc->bandstate[BAND_5G_INDEX]->band_stf_stbc_tx = (s8) int_val;
|
||||
|
|
Reference in New Issue