diff options
| author |   Arik Nemtsov <arik@wizery.com> | 2012-06-25 22:26:17 +0300 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-07-10 12:10:12 -0400 |
| commit | 8cdc44aab2dd83cf09512c7b64287e5f54bf117b (patch) | |
| tree | 5f2e098ae435eebfc0f0e013170bb835a7ddeb7e /drivers/net/wireless/ti/wlcore/main.c | |
| parent | wlcore/wl12xx/wl18xx: check min FW version (diff) | |
| download | linux-dev-8cdc44aab2dd83cf09512c7b64287e5f54bf117b.tar.xz linux-dev-8cdc44aab2dd83cf09512c7b64287e5f54bf117b.zip | |
wlcore: don't stop tx queue via watermark if already stopped
If a Tx queue is currently stopped because of our Tx watermark flow
control, don't stop it again. This causes a warning to appear.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 0cc9a0240220..7abb02ad1b37 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -1211,7 +1211,9 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) * The workqueue is slow to process the tx_queue and we need stop * the queue here, otherwise the queue will get too long. */ - if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) { + if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK && + !wlcore_is_queue_stopped_by_reason(wl, q, + WLCORE_QUEUE_STOP_REASON_WATERMARK)) { wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q); wlcore_stop_queue_locked(wl, q, WLCORE_QUEUE_STOP_REASON_WATERMARK); |