diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-29 13:50:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-29 13:50:10 -0700 |
| commit | 7905e357ebe67a26d9dc8caa1a0b8346431b5f0d (patch) | |
| tree | 134442df2f062caa6cebda1b352948b8209efcec /net/mac80211/tx.c | |
| parent | 083ba279d52bcad20f1dfa3cefd4255cbe82d521 (diff) | |
| parent | 76232ebf898c4d5e657f2b663fbf7108bca80ded (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index cbe53ed4fb0..08e1f17a422 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2010,14 +2010,12 @@ void ieee80211_tx_pending(unsigned long data) while (!skb_queue_empty(&local->pending[i])) { struct sk_buff *skb = __skb_dequeue(&local->pending[i]); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_sub_if_data *sdata; if (WARN_ON(!info->control.vif)) { kfree_skb(skb); continue; } - sdata = vif_to_sdata(info->control.vif); spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); |