lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: remove fullmac module_param brcmf_deferred_tx

Browse Source 
Remove brcmf_deferred_tx as it should be always 1

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Franky Lin
2011-09-16 12:27:52 -07:00
committed by Greg Kroah-Hartman
parent 6760e1ba63
commit 818cf60e4d
1 changed files with 23 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@@ -721,10 +721,6 @@ static int qcount[NUMPRIO];
static int tx_packets[NUMPRIO]; static int tx_packets[NUMPRIO];
#endif /* BCMDBG */ #endif /* BCMDBG */
/* Deferred transmit */
uint brcmf_deferred_tx = 1;
module_param(brcmf_deferred_tx, uint, 0);
/* Watchdog thread priority, -1 to use kernel timer */ /* Watchdog thread priority, -1 to use kernel timer */
int brcmf_watchdog_prio = 97; int brcmf_watchdog_prio = 97;
module_param(brcmf_watchdog_prio, int, 0); module_param(brcmf_watchdog_prio, int, 0);
@@ -2845,63 +2841,33 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *pkt)
/* Check for existing queue, current flow-control, /* Check for existing queue, current flow-control,
pending event, or pending clock */ pending event, or pending clock */
if (brcmf_deferred_tx || bus->fcstate || pktq_len(&bus->txq) brcmf_dbg(TRACE, "deferring pktq len %d\n", pktq_len(&bus->txq));
|| bus->dpc_sched || (!data_ok(bus)) bus->fcqueued++;
|| (bus->flowcontrol & NBITVAL(prec))
|| (bus->clkstate != CLK_AVAIL)) {
brcmf_dbg(TRACE, "deferring pktq len %d\n",
pktq_len(&bus->txq));
bus->fcqueued++;
/* Priority based enq */ /* Priority based enq */
spin_lock_bh(&bus->txqlock); spin_lock_bh(&bus->txqlock);
if (brcmf_c_prec_enq(bus->drvr, &bus->txq, pkt, prec) == if (brcmf_c_prec_enq(bus->drvr, &bus->txq, pkt, prec) == false) {
false) { skb_pull(pkt, SDPCM_HDRLEN);
skb_pull(pkt, SDPCM_HDRLEN); brcmf_txcomplete(bus->drvr, pkt, false);
brcmf_txcomplete(bus->drvr, pkt, false); brcmu_pkt_buf_free_skb(pkt);
brcmu_pkt_buf_free_skb(pkt); brcmf_dbg(ERROR, "out of bus->txq !!!\n");
brcmf_dbg(ERROR, "out of bus->txq !!!\n"); ret = -ENOSR;
ret = -ENOSR; } else {
} else { ret = 0;
ret = 0; }
} spin_unlock_bh(&bus->txqlock);
spin_unlock_bh(&bus->txqlock);
if (pktq_len(&bus->txq) >= TXHI) if (pktq_len(&bus->txq) >= TXHI)
brcmf_txflowcontrol(bus->drvr, 0, ON); brcmf_txflowcontrol(bus->drvr, 0, ON);
#ifdef BCMDBG #ifdef BCMDBG
if (pktq_plen(&bus->txq, prec) > qcount[prec]) if (pktq_plen(&bus->txq, prec) > qcount[prec])
qcount[prec] = pktq_plen(&bus->txq, prec); qcount[prec] = pktq_plen(&bus->txq, prec);
#endif #endif
/* Schedule DPC if needed to send queued packet(s) */ /* Schedule DPC if needed to send queued packet(s) */
if (brcmf_deferred_tx && !bus->dpc_sched) { if (!bus->dpc_sched) {
bus->dpc_sched = true; bus->dpc_sched = true;
brcmf_sdbrcm_sched_dpc(bus); brcmf_sdbrcm_sched_dpc(bus);
}
} else {
/* Lock: we're about to use shared data/code (and SDIO) */
brcmf_sdbrcm_sdlock(bus);
/* Otherwise, send it now */
bus_wake(bus);
/* Make sure back plane ht clk is on, no pending allowed */
brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, true);
brcmf_dbg(TRACE, "calling txpkt\n");
ret = brcmf_sdbrcm_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
if (ret)
bus->drvr->tx_errors++;
else
bus->drvr->dstats.tx_bytes += datalen;
if (bus->idletime == BRCMF_IDLE_IMMEDIATE &&
!bus->dpc_sched) {
bus->activity = false;
brcmf_sdbrcm_clkctl(bus, CLK_NONE, true);
}
brcmf_sdbrcm_sdunlock(bus);
} }
return ret; return ret;
@@ -5013,8 +4979,7 @@ int brcmf_bus_register(void)
break; break;
/* If both watchdog and DPC are threads, TX must be deferred */ /* If both watchdog and DPC are threads, TX must be deferred */
if ((brcmf_watchdog_prio >= 0) && (brcmf_dpc_prio >= 0) if (brcmf_watchdog_prio >= 0 && brcmf_dpc_prio >= 0)
&& brcmf_deferred_tx)
break; break;
brcmf_dbg(ERROR, "Invalid module parameters.\n"); brcmf_dbg(ERROR, "Invalid module parameters.\n");