Skip to content

Commit

Permalink
brcmsmac: Remove unimplemented flow control functions
Browse files Browse the repository at this point in the history
Functions for flow control exist but remain unimplemented. Remove these
in advance of adding real flow control.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Tested-by: Daniel Wagner <wagi@monom.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Seth Forshee authored and John W. Linville committed Nov 20, 2012
1 parent 05f8a61 commit 7f2de08
Showing 1 changed file with 0 additions and 31 deletions.
31 changes: 0 additions & 31 deletions drivers/net/wireless/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 7f2de08

Please sign in to comment.