From e4fafa092e2ade680eb11a1fe39658dfcc2b2e7d Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 24 Nov 2011 14:47:36 +0100 Subject: [PATCH] --- yaml --- r: 278417 b: refs/heads/master c: 4db4e0a17fb0e7b345b344cde141b252794c2f19 h: refs/heads/master i: 278415: 95f0fb5f07bce6632fa4d64ba04a46a2a9f7fc27 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cc710db43f9f..fbd169c89e05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4883993841638963fbae2f334899f29309466152 +refs/heads/master: 4db4e0a17fb0e7b345b344cde141b252794c2f19 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 68cbd0095429..6fad8fac3784 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -1227,9 +1227,10 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local, * queue is woken again. */ if (txpending) - skb_queue_splice(skbs, &local->pending[q]); + skb_queue_splice_init(skbs, &local->pending[q]); else - skb_queue_splice_tail(skbs, &local->pending[q]); + skb_queue_splice_tail_init(skbs, + &local->pending[q]); spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); @@ -1301,7 +1302,7 @@ static bool __ieee80211_tx(struct ieee80211_local *local, ieee80211_tpt_led_trig_tx(local, fc, led_len); ieee80211_led_tx(local, 1); - WARN_ON(!skb_queue_empty(skbs)); + WARN_ON_ONCE(!skb_queue_empty(skbs)); return result; }