diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 04:09:48 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 04:09:48 -0400 |
| commit | 6fb47de9cf1be4710fb9f364c500ff216fb47b34 (patch) | |
| tree | e638cd1de972e7120dff9200efe71ce1b4ca3805 /net/mac80211/iface.c | |
| parent | 1041638f2bba0f1de75e66086d50fb1251d64dcf (diff) | |
| parent | ab3d59d265e772e734c36fe738809cb1a910f566 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 944c6cf53eb7..1a6fe135f201 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -840,7 +840,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
| 840 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 840 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); |
| 841 | if (info->control.vif == &sdata->vif) { | 841 | if (info->control.vif == &sdata->vif) { |
| 842 | __skb_unlink(skb, &local->pending[i]); | 842 | __skb_unlink(skb, &local->pending[i]); |
| 843 | dev_kfree_skb_irq(skb); | 843 | ieee80211_free_txskb(&local->hw, skb); |
| 844 | } | 844 | } |
| 845 | } | 845 | } |
| 846 | } | 846 | } |