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

Commit 7f2de08f authored by Seth Forshee's avatar Seth Forshee Committed by John W. Linville
Browse files

brcmsmac: Remove unimplemented flow control functions 



Functions for flow control exist but remain unimplemented. Remove these
in advance of adding real flow control.

Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Tested-by: default avatarDaniel Wagner <wagi@monom.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 05f8a616

drivers/net/wireless/brcm80211/brcmsmac/main.c

+0 −31
Original line number Diff line number Diff line
@@ -35,12 +35,6 @@ 
#include "main.h"

#include "soc.h"



/*

 * Indication for txflowcontrol that all priority bits in

 * TXQ_STOP_FOR_PRIOFC_MASK are to be considered.

 */

#define ALLPRIO				-1



/* watchdog timer, in unit of ms */

#define TIMER_INTERVAL_WATCHDOG		1000

/* radio monitor timer, in unit of ms */
@@ -3767,25 +3761,6 @@ static void brcms_c_tx_prec_map_init(struct brcms_c_info *wlc) 
	wlc->fifo2prec_map[TX_AC_VO_FIFO] = BRCMS_PREC_BMP_AC_VO;

}



static void

brcms_c_txflowcontrol_signal(struct brcms_c_info *wlc,

			     struct brcms_txq_info *qi, bool on, int prio)

{

	/* transmit flowcontrol is not yet implemented */

}



static void brcms_c_txflowcontrol_reset(struct brcms_c_info *wlc)

{

	struct brcms_txq_info *qi;



	for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) {

		if (qi->stopped) {

			brcms_c_txflowcontrol_signal(wlc, qi, OFF, ALLPRIO);

			qi->stopped = 0;

		}

	}

}



/* push sw hps and wake state through hardware */

static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc)

{
@@ -5353,9 +5328,6 @@ uint brcms_c_down(struct brcms_c_info *wlc) 


	wlc_phy_mute_upd(wlc->band->pi, false, PHY_MUTE_ALL);



	/* clear txq flow control */

	brcms_c_txflowcontrol_reset(wlc);



	/* flush tx queues */

	for (qi = wlc->tx_queues; qi != NULL; qi = qi->next)

		brcmu_pktq_flush(&qi->q, true, NULL, NULL);
@@ -8302,9 +8274,6 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx) 
	if (mute_tx)

		brcms_b_mute(wlc->hw, true);



	/* clear tx flow control */

	brcms_c_txflowcontrol_reset(wlc);



	/* enable the RF Disable Delay timer */

	bcma_write32(core, D11REGOFFS(rfdisabledly), RFDISABLE_DEFAULT);