Commit 4be9393f authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed unused softmac mimo disable code 



No element in array locale_bn[] has the 'no mimo' flag bit set.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 93a03c62

drivers/staging/brcm80211/brcmsmac/channel.c

+3 −12
Original line number Diff line number Diff line
@@ -987,7 +987,6 @@ brcms_c_set_country_common(struct brcms_cm_info *wlc_cm, 
		       const char *ccode, uint regrev,

		       const struct country_info *country)

{

	const struct locale_mimo_info *li_mimo;

	const struct locale_info *locale;

	struct brcms_c_info *wlc = wlc_cm->wlc;

	char prev_country_abbrev[BRCM_CNTRY_BUF_SZ];
@@ -1003,17 +1002,9 @@ brcms_c_set_country_common(struct brcms_cm_info *wlc_cm, 
	strncpy(wlc_cm->ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);

	wlc_cm->regrev = regrev;



	/* disable/restore nmode based on country regulations */

	li_mimo = brcms_c_get_mimo_2g(country->locale_mimo_2G);

	if (li_mimo && (li_mimo->flags & BRCMS_NO_MIMO)) {

		brcms_c_set_nmode(wlc, OFF);

		wlc->stf->no_cddstbc = true;

	} else {

		wlc->stf->no_cddstbc = false;

	if ((wlc->pub->_n_enab & SUPPORT_11N) !=

	    wlc->protection->nmode_user)

		brcms_c_set_nmode(wlc, wlc->protection->nmode_user);

	}



	brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_2G_INDEX]);

	brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_5G_INDEX]);

drivers/staging/brcm80211/brcmsmac/main.h

+0 −2
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ struct brcms_protection { 
 * ss_algosel_auto: if true, use wlc->stf->ss_algo_channel;

 *			else use wlc->band->stf->ss_mode_band.

 * ss_algo_channel: ss based on per-channel algo: 0: SISO, 1: CDD 2: STBC.

 * no_cddstbc: stf override, 1: no CDD (or STBC) allowed.

 * rxchain_restore_delay: delay time to restore default rxchain.

 * ldpc: AUTO/ON/OFF ldpc cap supported.

 * txcore[MAX_STREAMS_SUPPORTED + 1]: bitmap of selected core for each Nsts.
@@ -213,7 +212,6 @@ struct brcms_stf { 
	u8 ss_opmode;

	bool ss_algosel_auto;

	u16 ss_algo_channel;

	u8 no_cddstbc;

	u8 rxchain_restore_delay;

	s8 ldpc;

	u8 txcore[MAX_STREAMS_SUPPORTED + 1];

drivers/staging/brcm80211/brcmsmac/stf.c

+6 −8
Original line number Diff line number Diff line
@@ -319,17 +319,15 @@ int brcms_c_stf_ss_update(struct brcms_c_info *wlc, struct brcms_band *band) 
	if (BRCMS_STBC_CAP_PHY(wlc) &&

	    wlc->stf->ss_algosel_auto

	    && (wlc->stf->ss_algo_channel != (u16) -1)) {

		upd_stf_ss = (wlc->stf->no_cddstbc || (wlc->stf->txstreams == 1)

			      || isset(&wlc->stf->ss_algo_channel,

				       PHY_TXC1_MODE_SISO)) ? PHY_TXC1_MODE_SISO

		    : PHY_TXC1_MODE_CDD;

		upd_stf_ss = (wlc->stf->txstreams == 1 ||

			      isset(&wlc->stf->ss_algo_channel,

				    PHY_TXC1_MODE_SISO)) ?

				    PHY_TXC1_MODE_SISO : PHY_TXC1_MODE_CDD;

	} else {

		if (wlc->band != band)

			return ret_code;

		upd_stf_ss = (wlc->stf->no_cddstbc

			      || (wlc->stf->txstreams ==

				  1)) ? PHY_TXC1_MODE_SISO : band->

		    band_stf_ss_mode;

		upd_stf_ss = (wlc->stf->txstreams == 1) ?

				PHY_TXC1_MODE_SISO : band->band_stf_ss_mode;

	}

	if (prev_stf_ss != upd_stf_ss) {

		wlc->stf->ss_opmode = upd_stf_ss;

CRA Git | Maintained and supported by SUSTech CRA and CCSE