From 697f60a97e8ea58ee12faf1321438ab79d905d09 Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Wed, 9 Mar 2011 15:04:15 -0800 Subject: [PATCH] --- yaml --- r: 236351 b: refs/heads/master c: 7c31607e165d5edfa13dea5d329e59f322d4cad2 h: refs/heads/master i: 236349: f6334733e828ded79980b3954c7af843e4876163 236347: 77a3ade4d09fa31a6e3d71d92d866405334bf68d 236343: ad0f85c44019288513fcd6a00ae4aa54bc46c3fe 236335: c5dbf63873ad7ec4c275f342b399385f598083e4 236319: b1225126b467efac4ad229c770386765a66c3b0d 236287: f19aec51815d9ccf3aca4721ffea2117fe8f7d59 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 98bb9ce141b1..745e36bbcd49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26a71a40292e3e29e461a2210d9c0c7339427b19 +refs/heads/master: 7c31607e165d5edfa13dea5d329e59f322d4cad2 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index f25e5b301119..dd2e36749d0a 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/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;