Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236351
b: refs/heads/master
c: 7c31607
h: refs/heads/master
i:
  236349: f633473
  236347: 77a3ade
  236343: ad0f85c
  236335: c5dbf63
  236319: b122512
  236287: f19aec5
v: v3
  • Loading branch information
Grant Grundler authored and Greg Kroah-Hartman committed Mar 9, 2011
1 parent 9a49a31 commit 697f60a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26a71a40292e3e29e461a2210d9c0c7339427b19
refs/heads/master: 7c31607e165d5edfa13dea5d329e59f322d4cad2
6 changes: 2 additions & 4 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 697f60a

Please sign in to comment.