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

Commit 7c783cef authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: replaced Broadcom specific acronym WLC 



WLC (caps) was replaced, wlc (small caps) has not been replaced yet.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bfaa5765

drivers/staging/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ struct brcmf_pub { 
	char *pktfilter[100];

	int pktfilter_count;



	u8 country_code[WLC_CNTRY_BUF_SZ];

	u8 country_code[BRCM_CNTRY_BUF_SZ];

	char eventmask[BRCMF_EVENTING_MASK_LEN];



};

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+20 −20
Original line number Diff line number Diff line
@@ -363,18 +363,18 @@ do { \ 
	}



static struct ieee80211_rate __wl_rates[] = {

	RATETAB_ENT(WLC_RATE_1M, 0),

	RATETAB_ENT(WLC_RATE_2M, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(WLC_RATE_5M5, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(WLC_RATE_11M, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(WLC_RATE_6M, 0),

	RATETAB_ENT(WLC_RATE_9M, 0),

	RATETAB_ENT(WLC_RATE_12M, 0),

	RATETAB_ENT(WLC_RATE_18M, 0),

	RATETAB_ENT(WLC_RATE_24M, 0),

	RATETAB_ENT(WLC_RATE_36M, 0),

	RATETAB_ENT(WLC_RATE_48M, 0),

	RATETAB_ENT(WLC_RATE_54M, 0),

	RATETAB_ENT(BRCM_RATE_1M, 0),

	RATETAB_ENT(BRCM_RATE_2M, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(BRCM_RATE_5M5, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(BRCM_RATE_11M, IEEE80211_RATE_SHORT_PREAMBLE),

	RATETAB_ENT(BRCM_RATE_6M, 0),

	RATETAB_ENT(BRCM_RATE_9M, 0),

	RATETAB_ENT(BRCM_RATE_12M, 0),

	RATETAB_ENT(BRCM_RATE_18M, 0),

	RATETAB_ENT(BRCM_RATE_24M, 0),

	RATETAB_ENT(BRCM_RATE_36M, 0),

	RATETAB_ENT(BRCM_RATE_48M, 0),

	RATETAB_ENT(BRCM_RATE_54M, 0),

};



#define wl_a_rates		(__wl_rates + 4)
@@ -895,7 +895,7 @@ static s32 brcmf_set_frag(struct net_device *dev, u32 frag_threshold) 
static s32 brcmf_set_retry(struct net_device *dev, u32 retry, bool l)

{

	s32 err = 0;

	u32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL);

	u32 cmd = (l ? BRCM_SET_LRL : BRCM_SET_SRL);



	retry = cpu_to_le32(retry);

	err = brcmf_dev_ioctl(dev, cmd, &retry, sizeof(retry));
@@ -1025,7 +1025,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 
	else

		bcnprd = cpu_to_le32(100);



	err = brcmf_dev_ioctl(dev, WLC_SET_BCNPRD, &bcnprd, sizeof(bcnprd));

	err = brcmf_dev_ioctl(dev, BRCM_SET_BCNPRD, &bcnprd, sizeof(bcnprd));

	if (unlikely(err)) {

		WL_ERR("WLC_SET_BCNPRD failed (%d)\n", err);

		goto done;
@@ -1068,7 +1068,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, 


		/* set channel for starter */

		target_channel = cpu_to_le32(cfg_priv->channel);

		err = brcmf_dev_ioctl(dev, WLC_SET_CHANNEL,

		err = brcmf_dev_ioctl(dev, BRCM_SET_CHANNEL,

			&target_channel, sizeof(target_channel));

		if (unlikely(err)) {

			WL_ERR("WLC_SET_CHANNEL failed (%d)\n", err);
@@ -2039,7 +2039,7 @@ brcmf_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev, 


	/* addr param is always NULL. ignore it */

	/* Get current rateset */

	err = brcmf_dev_ioctl(dev, WLC_GET_CURR_RATESET, &rateset,

	err = brcmf_dev_ioctl(dev, BRCM_GET_CURR_RATESET, &rateset,

			sizeof(rateset));

	if (unlikely(err)) {

		WL_ERR("could not get current rateset (%d)\n", err);
@@ -3755,7 +3755,7 @@ brcmf_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout) 
	}



	roamtrigger[0] = WL_ROAM_TRIGGER_LEVEL;

	roamtrigger[1] = WLC_BAND_ALL;

	roamtrigger[1] = BRCM_BAND_ALL;

	err = brcmf_dev_ioctl(ndev, BRCMF_C_SET_ROAM_TRIGGER,

			(void *)roamtrigger, sizeof(roamtrigger));

	if (unlikely(err)) {
@@ -3764,7 +3764,7 @@ brcmf_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout) 
	}



	roam_delta[0] = WL_ROAM_DELTA;

	roam_delta[1] = WLC_BAND_ALL;

	roam_delta[1] = BRCM_BAND_ALL;

	err = brcmf_dev_ioctl(ndev, BRCMF_C_SET_ROAM_DELTA,

				(void *)roam_delta, sizeof(roam_delta));

	if (unlikely(err)) {
@@ -3865,8 +3865,8 @@ static s32 wl_update_wiphybands(struct brcmf_cfg80211_priv *cfg_priv) 
	s8 phy;

	s32 err = 0;



	err = brcmf_dev_ioctl(cfg_to_ndev(cfg_priv), WLC_GET_PHYLIST, &phy_list,

			sizeof(phy_list));

	err = brcmf_dev_ioctl(cfg_to_ndev(cfg_priv), BRCM_GET_PHYLIST,

			      &phy_list, sizeof(phy_list));

	if (unlikely(err)) {

		WL_ERR("error (%d)\n", err);

		return err;

drivers/staging/brcm80211/brcmsmac/alloc.c

+8 −7
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid) 
	tunables->maxscb = MAXSCB;

	tunables->ampdunummpdu = AMPDU_NUM_MPDU;

	tunables->maxpktcb = MAXPKTCB;

	tunables->maxucodebss = WLC_MAX_UCODE_BSS;

	tunables->maxucodebss4 = WLC_MAX_UCODE_BSS4;

	tunables->maxucodebss = BRCMS_MAX_UCODE_BSS;

	tunables->maxucodebss4 = BRCMS_MAX_UCODE_BSS4;

	tunables->maxbss = MAXBSS;

	tunables->datahiwat = WLC_DATAHIWAT;

	tunables->ampdudatahiwat = WLC_AMPDUDATAHIWAT;

	tunables->datahiwat = BRCMS_DATAHIWAT;

	tunables->ampdudatahiwat = BRCMS_AMPDUDATAHIWAT;

	tunables->rxbnd = RXBND;

	tunables->txsbnd = TXSBND;

}
@@ -169,7 +169,7 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
	}



	wlc->modulecb =

		kzalloc(sizeof(struct modulecb) * WLC_MAXMODULES, GFP_ATOMIC);

		kzalloc(sizeof(struct modulecb) * BRCMS_MAXMODULES, GFP_ATOMIC);

	if (wlc->modulecb == NULL) {

		*err = 1009;

		goto fail;
@@ -189,13 +189,14 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
	brcms_c_bsscfg_ID_assign(wlc, wlc->cfg);



	wlc->wsec_def_keys[0] =

		kzalloc(sizeof(struct wsec_key) * WLC_DEFAULT_KEYS, GFP_ATOMIC);

		kzalloc(sizeof(struct wsec_key) * BRCMS_DEFAULT_KEYS,

			GFP_ATOMIC);

	if (wlc->wsec_def_keys[0] == NULL) {

		*err = 1015;

		goto fail;

	} else {

		int i;

		for (i = 1; i < WLC_DEFAULT_KEYS; i++) {

		for (i = 1; i < BRCMS_DEFAULT_KEYS; i++) {

			wlc->wsec_def_keys[i] = (struct wsec_key *)

			    ((unsigned long)wlc->wsec_def_keys[0] +

			     (sizeof(struct wsec_key) * i));

drivers/staging/brcm80211/brcmsmac/ampdu.c

+22 −22
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_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))

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

		ampdu->rx_factor = IEEE80211_HT_MAX_AMPDU_32K;

	else

		ampdu->rx_factor = IEEE80211_HT_MAX_AMPDU_64K;
@@ -443,10 +443,10 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 
	struct sk_buff *p, *pkt[AMPDU_MAX_MPDU];

	u8 tid, ndelim;

	int err = 0;

	u8 preamble_type = WLC_GF_PREAMBLE;

	u8 fbr_preamble_type = WLC_GF_PREAMBLE;

	u8 rts_preamble_type = WLC_LONG_PREAMBLE;

	u8 rts_fbr_preamble_type = WLC_LONG_PREAMBLE;

	u8 preamble_type = BRCMS_GF_PREAMBLE;

	u8 fbr_preamble_type = BRCMS_GF_PREAMBLE;

	u8 rts_preamble_type = BRCMS_LONG_PREAMBLE;

	u8 rts_fbr_preamble_type = BRCMS_LONG_PREAMBLE;



	bool rr = true, fbr = false;

	uint i, count = 0, fifo, seg_cnt = 0;
@@ -551,8 +551,8 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 
		}



		/* extract the length info */

		len = fbr_iscck ? WLC_GET_CCK_PLCP_LEN(txh->FragPLCPFallback)

		    : WLC_GET_MIMO_PLCP_LEN(txh->FragPLCPFallback);

		len = fbr_iscck ? BRCMS_GET_CCK_PLCP_LEN(txh->FragPLCPFallback)

		    : BRCMS_GET_MIMO_PLCP_LEN(txh->FragPLCPFallback);



		/* retrieve null delimiter count */

		ndelim = txh->RTSPLCPFallback[AMPDU_FBR_NULL_DELIM];
@@ -622,7 +622,7 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 


			if (is40)

				mimo_ctlchbw =

				    CHSPEC_SB_UPPER(WLC_BAND_PI_RADIO_CHANSPEC)

				   CHSPEC_SB_UPPER(BRCMS_BAND_PI_RADIO_CHANSPEC)

				   ? PHY_TXC1_BW_20MHZ_UP : PHY_TXC1_BW_20MHZ;



			/* rebuild the rspec and rspec_fallback */
@@ -717,31 +717,31 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 


		/* remove the pad len from last mpdu */

		fbr_iscck = ((le16_to_cpu(txh->XtraFrameTypes) & 0x3) == 0);

		len = fbr_iscck ? WLC_GET_CCK_PLCP_LEN(txh->FragPLCPFallback)

		    : WLC_GET_MIMO_PLCP_LEN(txh->FragPLCPFallback);

		len = fbr_iscck ? BRCMS_GET_CCK_PLCP_LEN(txh->FragPLCPFallback)

		    : BRCMS_GET_MIMO_PLCP_LEN(txh->FragPLCPFallback);

		ampdu_len -= roundup(len, 4) - len;



		/* patch up the first txh & plcp */

		txh = (struct d11txh *) pkt[0]->data;

		plcp = (u8 *) (txh + 1);



		WLC_SET_MIMO_PLCP_LEN(plcp, ampdu_len);

		BRCMS_SET_MIMO_PLCP_LEN(plcp, ampdu_len);

		/* mark plcp to indicate ampdu */

		WLC_SET_MIMO_PLCP_AMPDU(plcp);

		BRCMS_SET_MIMO_PLCP_AMPDU(plcp);



		/* reset the mixed mode header durations */

		if (txh->MModeLen) {

			u16 mmodelen =

			    brcms_c_calc_lsig_len(wlc, rspec, ampdu_len);

			txh->MModeLen = cpu_to_le16(mmodelen);

			preamble_type = WLC_MM_PREAMBLE;

			preamble_type = BRCMS_MM_PREAMBLE;

		}

		if (txh->MModeFbrLen) {

			u16 mmfbrlen =

			    brcms_c_calc_lsig_len(wlc, rspec_fallback,

						  ampdu_len);

			txh->MModeFbrLen = cpu_to_le16(mmfbrlen);

			fbr_preamble_type = WLC_MM_PREAMBLE;

			fbr_preamble_type = BRCMS_MM_PREAMBLE;

		}



		/* set the preload length */
@@ -759,11 +759,11 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 
			rts = (struct ieee80211_rts *)&txh->rts_frame;

			if ((mch & TXC_PREAMBLE_RTS_MAIN_SHORT) ==

			    TXC_PREAMBLE_RTS_MAIN_SHORT)

				rts_preamble_type = WLC_SHORT_PREAMBLE;

				rts_preamble_type = BRCMS_SHORT_PREAMBLE;



			if ((mch & TXC_PREAMBLE_RTS_FB_SHORT) ==

			    TXC_PREAMBLE_RTS_FB_SHORT)

				rts_fbr_preamble_type = WLC_SHORT_PREAMBLE;

				rts_fbr_preamble_type = BRCMS_SHORT_PREAMBLE;



			durid =

			    brcms_c_compute_rtscts_dur(wlc, use_cts, rts_rspec,
@@ -788,8 +788,8 @@ brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi, 
		if (fbr) {

			mch |= TXC_AMPDU_FBR;

			txh->MacTxControlHigh = cpu_to_le16(mch);

			WLC_SET_MIMO_PLCP_AMPDU(plcp);

			WLC_SET_MIMO_PLCP_AMPDU(txh->FragPLCPFallback);

			BRCMS_SET_MIMO_PLCP_AMPDU(plcp);

			BRCMS_SET_MIMO_PLCP_AMPDU(txh->FragPLCPFallback);

		}



		BCMMSG(wlc->wiphy, "wl%d: count %d ampdu_len %d\n",
@@ -1046,9 +1046,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
				ini->tx_in_transit--;

				/* Use high prededence for retransmit to give some punch */

				/* brcms_c_txq_enq(wlc, scb, p,

				 * WLC_PRIO_TO_PREC(tid)); */

				 * BRCMS_PRIO_TO_PREC(tid)); */

				brcms_c_txq_enq(wlc, scb, p,

					    WLC_PRIO_TO_HI_PREC(tid));

					    BRCMS_PRIO_TO_HI_PREC(tid));

			} else {

				/* Retry timeout */

				ini->tx_in_transit--;
@@ -1108,7 +1108,7 @@ static int brcms_c_ampdu_set(struct ampdu_info *ampdu, bool on) 


static bool brcms_c_ampdu_cap(struct ampdu_info *ampdu)

{

	if (WLC_PHY_11N_CAP(ampdu->wlc->band))

	if (BRCMS_PHY_11N_CAP(ampdu->wlc->band))

		return true;

	else

		return false;

drivers/staging/brcm80211/brcmsmac/antsel.c

+7 −6
Original line number Diff line number Diff line
@@ -31,11 +31,12 @@ 
#define ANT_SELCFG_RX_DEF	3	/* default rx antenna configuration */



/* useful macros */

#define WLC_ANTSEL_11N_0(ant)	((((ant) & ANT_SELCFG_MASK) >> 4) & 0xf)

#define WLC_ANTSEL_11N_1(ant)	(((ant) & ANT_SELCFG_MASK) & 0xf)

#define WLC_ANTIDX_11N(ant)	(((WLC_ANTSEL_11N_0(ant)) << 2) + (WLC_ANTSEL_11N_1(ant)))

#define WLC_ANT_ISAUTO_11N(ant)	(((ant) & ANT_SELCFG_AUTO) == ANT_SELCFG_AUTO)

#define WLC_ANTSEL_11N(ant)	((ant) & ANT_SELCFG_MASK)

#define BRCMS_ANTSEL_11N_0(ant)	((((ant) & ANT_SELCFG_MASK) >> 4) & 0xf)

#define BRCMS_ANTSEL_11N_1(ant)	(((ant) & ANT_SELCFG_MASK) & 0xf)

#define BRCMS_ANTIDX_11N(ant)	(((BRCMS_ANTSEL_11N_0(ant)) << 2) +\

				(BRCMS_ANTSEL_11N_1(ant)))

#define BRCMS_ANT_ISAUTO_11N(ant) (((ant) & ANT_SELCFG_AUTO) == ANT_SELCFG_AUTO)

#define BRCMS_ANTSEL_11N(ant)	((ant) & ANT_SELCFG_MASK)



/* antenna switch */

/* defines for no boardlevel antenna diversity */
@@ -263,7 +264,7 @@ static u8 brcms_c_antsel_id2antcfg(struct antsel_info *asi, u8 id) 
/* boardlevel antenna selection: convert ant_cfg to mimo_antsel (ucode interface) */

static u16 brcms_c_antsel_antcfg2antsel(struct antsel_info *asi, u8 ant_cfg)

{

	u8 idx = WLC_ANTIDX_11N(WLC_ANTSEL_11N(ant_cfg));

	u8 idx = BRCMS_ANTIDX_11N(BRCMS_ANTSEL_11N(ant_cfg));

	u16 mimo_antsel = 0;



	if (asi->antsel_type == ANTSEL_2x4) {