summaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211
diff options
context:
space:
mode:
authorGrant Grundler <grundler@google.com>2011-03-09 15:04:15 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 15:55:52 -0800
commit7c31607e165d5edfa13dea5d329e59f322d4cad2 (patch)
treed3fde8ec7b9a4db892ae6d01a36622c7766603c2 /drivers/staging/brcm80211
parent26a71a40292e3e29e461a2210d9c0c7339427b19 (diff)
STAGING: brcm80211 remove dhd_doflow
Remove dhd_doflow. iperf result without flow control is unacceptable. Signed-off-by: Grant Grundler <grundler@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_sdio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index f25e5b301119..dd2e36749d0a 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -333,7 +333,6 @@ uint dhd_txminmax;
#define DONGLE_MIN_MEMSIZE (128 * 1024)
int dhd_dongle_memsize;
-static bool dhd_doflow;
static bool dhd_alignctl;
static bool sd1idle;
@@ -1119,7 +1118,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, struct sk_buff *pkt)
}
dhd_os_sdunlock_txq(bus->dhd);
- if ((pktq_len(&bus->txq) >= TXHI) && dhd_doflow)
+ if (pktq_len(&bus->txq) >= TXHI)
dhd_txflowcontrol(bus->dhd, 0, ON);
#ifdef DHD_DEBUG
@@ -1217,7 +1216,7 @@ static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
}
/* Deflow-control stack if needed */
- if (dhd_doflow && dhd->up && (dhd->busstate == DHD_BUS_DATA) &&
+ if (dhd->up && (dhd->busstate == DHD_BUS_DATA) &&
dhd->txoff && (pktq_len(&bus->txq) < TXLOW))
dhd_txflowcontrol(dhd, 0, OFF);
@@ -5073,7 +5072,6 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no,
sd1idle = true;
dhd_readahead = true;
retrydata = false;
- dhd_doflow = false;
dhd_dongle_memsize = 0;
dhd_txminmax = DHD_TXMINMAX;