diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-04-18 15:26:37 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-19 15:39:09 -0400 |
| commit | 62fe778412b36791b7897cfa139342906fbbf07b (patch) | |
| tree | 579b60a8258ea6a3207a9f83fb0cd1d3be9f5625 | |
| parent | 44704e5d7d56625ff93d5a119ca846ae4de9061c (diff) | |
| download | op-kernel-dev-62fe778412b36791b7897cfa139342906fbbf07b.zip op-kernel-dev-62fe778412b36791b7897cfa139342906fbbf07b.tar.gz | |
rt2x00: Fix stuck queue in tx failure case
Since commit 0b7fde54f94979edc67bbf86b5adba702ebfefe8 "rt2x00: Protect
queue control with mutex" rt2x00 used rt2x00queue_pause_queue for
stopping a tx queue in mac80211. But in case of a failure in the tx
path rt2x00 still called ieee80211_stop_queue which stopped the queue
but prevented rt2x00queue_unpause_queue to wake the queue up again
resulting in a stuck tx queue.
Fix this by also using rt2x00queue_pause_queue in case of tx failures.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 661c6ba..4a1c41b 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -158,7 +158,7 @@ void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) return; exit_fail: - ieee80211_stop_queue(rt2x00dev->hw, qid); + rt2x00queue_pause_queue(queue); dev_kfree_skb_any(skb); } EXPORT_SYMBOL_GPL(rt2x00mac_tx); |
