Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4728c38 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Greg Kroah-Hartman
Browse files

brcm80211: replace broadcom specific defines 



AMPDU_RX_FACTOR_64K -> IEEE80211_HT_MAX_AMPDU_64K
AMPDU_RX_FACTOR_32K -> IEEE80211_HT_MAX_AMPDU_32K
DOT11_MAX_KEY_SIZE -> WLAN_MAX_KEY_LEN
HT_CAP_MIMO_PS_MASK -> IEEE80211_HT_CAP_SM_PS
HT_CAP_MAX_AMSDU -> IEEE80211_HT_CAP_MAX_AMSDU
HT_CAP_RX_STBC_MASK -> IEEE80211_HT_CAP_RX_STBC
HT_CAP_RX_STBC_SHIFT -> IEEE80211_HT_CAP_RX_STBC_SHIFT
HT_PARAMS_RX_FACTOR_MASK -> IEEE80211_HT_AMPDU_PARM_FACTOR

Signed-off-by: default avatarStanislav Fomichev <kernel@fomichev.me>
Acked-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fd4bd42e

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
	key.index = key_idx;

	swap_key_to_BE(&key);

	memset(&params, 0, sizeof(params));

	params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);

	params.key_len = (u8) min_t(u8, WLAN_MAX_KEY_LEN, key.len);

	memcpy(params.key, key.data, params.key_len);



	err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec));

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+1 −1
Original line number Diff line number Diff line
@@ -2435,7 +2435,7 @@ wl_iw_get_encode(struct net_device *dev, 


	wsec = le32_to_cpu(wsec);

	auth = le32_to_cpu(auth);

	dwrq->length = min_t(u16, DOT11_MAX_KEY_SIZE, key.len);

	dwrq->length = min_t(u16, WLAN_MAX_KEY_LEN, key.len);



	dwrq->flags = key.index + 1;

	if (!(wsec & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED)))

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+3 −3
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ wl_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		  AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);



	sta->ht_cap.ht_supported = true;

	sta->ht_cap.ampdu_factor = AMPDU_RX_FACTOR_64K;

	sta->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;

	sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;

	sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |

	    IEEE80211_HT_CAP_SGI_20 |
@@ -989,7 +989,7 @@ static struct ieee80211_supported_band wl_band_2GHz_nphy = { 
		   IEEE80211_HT_CAP_SGI_20 |

		   IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,

		   .ht_supported = true,

		   .ampdu_factor = AMPDU_RX_FACTOR_64K,

		   .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,

		   .ampdu_density = AMPDU_DEF_MPDU_DENSITY,

		   .mcs = {

			   /* placeholders for now */
@@ -1009,7 +1009,7 @@ static struct ieee80211_supported_band wl_band_5GHz_nphy = { 
		   /* use IEEE80211_HT_CAP_* from include/linux/ieee80211.h */

		   .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,	/* No 40 mhz yet */

		   .ht_supported = true,

		   .ampdu_factor = AMPDU_RX_FACTOR_64K,

		   .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,

		   .ampdu_density = AMPDU_DEF_MPDU_DENSITY,

		   .mcs = {

			   /* placeholders for now */

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+4 −4
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ struct ampdu_info *wlc_ampdu_attach(struct wlc_info *wlc) 
	ampdu->ffpld_rsvd = AMPDU_DEF_FFPLD_RSVD;

	/* bump max ampdu rcv size to 64k for all 11n devices except 4321A0 and 4321A1 */

	if (WLCISNPHY(wlc->band) && NREV_LT(wlc->band->phyrev, 2))

		ampdu->rx_factor = AMPDU_RX_FACTOR_32K;

		ampdu->rx_factor = IEEE80211_HT_MAX_AMPDU_32K;

	else

		ampdu->rx_factor = AMPDU_RX_FACTOR_64K;

		ampdu->rx_factor = IEEE80211_HT_MAX_AMPDU_64K;

	ampdu->retry_limit = AMPDU_DEF_RETRY_LIMIT;

	ampdu->rr_retry_limit = AMPDU_DEF_RR_RETRY_LIMIT;
@@ -1340,8 +1340,8 @@ void wlc_ampdu_shm_upd(struct ampdu_info *ampdu) 
	struct wlc_info *wlc = ampdu->wlc;



	/* Extend ucode internal watchdog timer to match larger received frames */

	if ((ampdu->rx_factor & HT_PARAMS_RX_FACTOR_MASK) ==

	    AMPDU_RX_FACTOR_64K) {

	if ((ampdu->rx_factor & IEEE80211_HT_AMPDU_PARM_FACTOR) ==

	    IEEE80211_HT_MAX_AMPDU_64K) {

		wlc_write_shm(wlc, M_MIMO_MAXSYM, MIMO_MAXSYM_MAX);

		wlc_write_shm(wlc, M_WATCHDOG_8TU, WATCHDOG_8TU_MAX);

	} else {

drivers/staging/brcm80211/brcmsmac/wlc_key.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ typedef struct wsec_key { 
	s8 icv_len;		/* ICV length */

	u32 len;		/* key length..don't move this var */

	/* data is 4byte aligned */

	u8 data[DOT11_MAX_KEY_SIZE];	/* key data */

	u8 data[WLAN_MAX_KEY_LEN];	/* key data */

	wsec_iv_t rxiv[WLC_NUMRXIVS];	/* Rx IV (one per TID) */

	wsec_iv_t txiv;		/* Tx IV */