Commit 00cf25ae authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: cleanup of softmac macro EDCF_ENAB() 



Since structure member pub->_wme is set to AUTO early in init, macro
EDCF_ENAB is always 'true' after that. All code that uses ECDF_ENAB()
appears in the code flow after the init.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 11de5b72

drivers/staging/brcm80211/brcmsmac/main.c

+7 −46
Original line number Diff line number Diff line
@@ -3579,20 +3579,11 @@ static void brcms_c_tx_prec_map_init(struct brcms_c_info *wlc) 
	wlc->tx_prec_map = BRCMS_PREC_BMP_ALL;

	memset(wlc->fifo2prec_map, 0, NFIFO * sizeof(u16));



	/*

	 * For non-WME, both fifos have overlapping MAXPRIO. So just

	 * disable all precedences if either is full.

	 */

	if (!EDCF_ENAB(wlc->pub)) {

		wlc->fifo2prec_map[TX_DATA_FIFO] = BRCMS_PREC_BMP_ALL;

		wlc->fifo2prec_map[TX_CTL_FIFO] = BRCMS_PREC_BMP_ALL;

	} else {

	wlc->fifo2prec_map[TX_AC_BK_FIFO] = BRCMS_PREC_BMP_AC_BK;

	wlc->fifo2prec_map[TX_AC_BE_FIFO] = BRCMS_PREC_BMP_AC_BE;

	wlc->fifo2prec_map[TX_AC_VI_FIFO] = BRCMS_PREC_BMP_AC_VI;

	wlc->fifo2prec_map[TX_AC_VO_FIFO] = BRCMS_PREC_BMP_AC_VO;

}

}



static void

brcms_c_txflowcontrol_signal(struct brcms_c_info *wlc,
@@ -3698,10 +3689,8 @@ void brcms_c_init(struct brcms_c_info *wlc) 
	brcms_c_bsinit(wlc);



	/* Enable EDCF mode (while the MAC is suspended) */

	if (EDCF_ENAB(wlc->pub)) {

	OR_REG(&regs->ifs_ctl, IFS_USEEDCF);

	brcms_c_edcf_setparams(wlc, false);

	}



	/* Init precedence maps for empty FIFOs */

	brcms_c_tx_prec_map_init(wlc);
@@ -4538,7 +4527,6 @@ void brcms_c_info_init(struct brcms_c_info *wlc, int unit) 
	wlc->LRL = RETRY_LONG_DEF;



	/* WME QoS mode is Auto by default */

	wlc->pub->_wme = AUTO;

	wlc->pub->_ampdu = AMPDU_AGG_HOST;

	wlc->pub->bcmerror = 0;
@@ -5745,10 +5733,7 @@ int brcms_c_up(struct brcms_c_info *wlc) 
	brcms_c_radio_monitor_stop(wlc);



	/* Set EDCF hostflags */

	if (EDCF_ENAB(wlc->pub))

	brcms_c_mhf(wlc, MHF1, MHF1_EDCF, MHF1_EDCF, BRCM_BAND_ALL);

	else

		brcms_c_mhf(wlc, MHF1, MHF1_EDCF, 0, BRCM_BAND_ALL);



	if (BRCMS_WAR16165(wlc))

		brcms_c_mhf(wlc, MHF2, MHF2_PCISLOWCLKWAR, MHF2_PCISLOWCLKWAR,
@@ -6715,27 +6700,12 @@ void brcms_c_txq_enq(struct brcms_c_info *wlc, struct scb *scb, 
	prio = sdu->priority;



	if (!brcms_c_prec_enq(wlc, q, sdu, prec)) {

		if (!EDCF_ENAB(wlc->pub))

			wiphy_err(wlc->wiphy, "wl%d: txq_enq: txq overflow"

				  "\n", wlc->pub->unit);



		/*

		 * we might hit this condtion in case

		 * packet flooding from mac80211 stack

		 */

		brcmu_pkt_buf_free_skb(sdu);

	}



	/*

	 * Check if flow control needs to be turned on after enqueuing the

	 * packet. Don't turn on flow control if EDCF is enabled. Driver

	 * would make the decision on what to drop instead of relying on

	 * stack to make the right decision

	 */

	if (!EDCF_ENAB(wlc->pub)) {

		if (pktq_len(q) >= BRCMS_DATAHIWAT)

			brcms_c_txflowcontrol(wlc, qi, ON, ALLPRIO);

	}

}



/*
@@ -7729,15 +7699,6 @@ void brcms_c_send_q(struct brcms_c_info *wlc) 
		}

	}



	/*

	 * Check if flow control needs to be turned off after

	 * sending the packet

	 */

	if (!EDCF_ENAB(wlc->pub)) {

		if (brcms_c_txflowcontrol_prio_isset(wlc, qi, ALLPRIO)

		    && (pktq_len(q) < BRCMS_DATAHIWAT / 2))

			brcms_c_txflowcontrol(wlc, qi, OFF, ALLPRIO);

	}

	in_send_q = false;

}

drivers/staging/brcm80211/brcmsmac/main.h

+0 −2
Original line number Diff line number Diff line
@@ -849,8 +849,6 @@ extern void brcms_c_set_home_chanspec(struct brcms_c_info *wlc, 
				      u16 chanspec);

extern bool brcms_c_ps_allowed(struct brcms_c_info *wlc);

extern bool brcms_c_stay_awake(struct brcms_c_info *wlc);

extern void brcms_c_wme_initparams_sta(struct brcms_c_info *wlc,

				       struct wme_param_ie *pe);



extern void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw,

				     u8 antsel_type);

drivers/staging/brcm80211/brcmsmac/pub.h

+0 −4
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ struct brcms_pub { 


	bool promisc;		/* promiscuous destination address */

	bool delayed_down;	/* down delayed */

	int _wme;		/* WME QoS mode */

	bool associated;	/* true:part of [I]BSS, false: not */

	/* (union of stas_associated, aps_associated) */

	bool _ampdu;		/* ampdu enabled or not */
@@ -197,9 +196,6 @@ enum wlc_par_id { 
/* WL11N Support */

#define AMPDU_AGG_HOST	1



#define EDCF_ENAB(pub) ((pub)->_wme != OFF)

#define QOS_ENAB(pub) ((pub)->_wme != OFF || (pub)->_n_enab & SUPPORT_11N)



/* pri is priority encoded in the packet. This maps the Packet priority to

 * enqueue precedence as defined in wlc_prec_map

 */

drivers/staging/brcm80211/brcmsmac/scb.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define AMPDU_MAX_SCB_TID	NUMPRIO



/* scb flags */

#define SCB_WMECAP		0x0040	/* may ONLY be set if pub->_wme!=OFF */

#define SCB_WMECAP		0x0040

#define SCB_HTCAP		0x10000	/* HT (MIMO) capable device */

#define SCB_IS40		0x80000	/* 40MHz capable */

#define SCB_STBCCAP		0x40000000	/* STBC Capable */