summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-09-18 00:15:13 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-21 11:05:26 -0400
commit2c7808d9345b91bb19f6bfaebf7b9e0916b0859a (patch)
tree623d614f7320b5164f64aba758a02dd2e40d02c8 /drivers
parent735761108f435a30bbabb5254fc5a8e17b99f2a1 (diff)
carl9170: fix hang in AP mode when HT STA does PSM
This is a obvious bug, skb_queue_walk does not work if the iterator gets removed from the queue. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index ea49d54ce03b..43de9dfa5820 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1412,7 +1412,7 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw,
{
struct ar9170 *ar = hw->priv;
struct carl9170_sta_info *sta_info = (void *) sta->drv_priv;
- struct sk_buff *skb;
+ struct sk_buff *skb, *tmp;
struct sk_buff_head free;
int i;
@@ -1462,7 +1462,7 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw,
for (i = 0; i < ar->hw->queues; i++) {
spin_lock_bh(&ar->tx_pending[i].lock);
- skb_queue_walk(&ar->tx_pending[i], skb) {
+ skb_queue_walk_safe(&ar->tx_pending[i], skb, tmp) {
struct _carl9170_tx_superframe *super;
struct ieee80211_hdr *hdr;