diff options
author | Michael Braun <michael-dev@fami-braun.de> | 2013-02-13 10:49:15 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:08 -0500 |
commit | 397a7a24ef8c2967a3e8090013f9c54714110c48 (patch) | |
tree | 6207383d15efbc24ffd1a4efba09505c6016a9a8 /net/mac80211/iface.c | |
parent | 164eb02d070af987890e1db1c12b8ae0394b19f7 (diff) |
mac80211: free ps->bc_buf skbs on vlan device stop
When the vlan device is removed, ps->bc_buf processing can no longer
send its frames.
Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index e9223ce2bf99..86c83084542a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -680,6 +680,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
680 | struct sk_buff *skb, *tmp; | 680 | struct sk_buff *skb, *tmp; |
681 | u32 hw_reconf_flags = 0; | 681 | u32 hw_reconf_flags = 0; |
682 | int i, flushed; | 682 | int i, flushed; |
683 | struct ps_data *ps; | ||
683 | 684 | ||
684 | clear_bit(SDATA_STATE_RUNNING, &sdata->state); | 685 | clear_bit(SDATA_STATE_RUNNING, &sdata->state); |
685 | 686 | ||
@@ -768,6 +769,19 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
768 | u.vlan.list) | 769 | u.vlan.list) |
769 | dev_close(vlan->dev); | 770 | dev_close(vlan->dev); |
770 | WARN_ON(!list_empty(&sdata->u.ap.vlans)); | 771 | WARN_ON(!list_empty(&sdata->u.ap.vlans)); |
772 | } else if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { | ||
773 | /* remove all packets in parent bc_buf pointing to this dev */ | ||
774 | ps = &sdata->bss->ps; | ||
775 | |||
776 | spin_lock_irqsave(&ps->bc_buf.lock, flags); | ||
777 | skb_queue_walk_safe(&ps->bc_buf, skb, tmp) { | ||
778 | if (skb->dev == sdata->dev) { | ||
779 | __skb_unlink(skb, &ps->bc_buf); | ||
780 | local->total_ps_buffered--; | ||
781 | ieee80211_free_txskb(&local->hw, skb); | ||
782 | } | ||
783 | } | ||
784 | spin_unlock_irqrestore(&ps->bc_buf.lock, flags); | ||
771 | } else if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 785 | } else if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
772 | ieee80211_mgd_stop(sdata); | 786 | ieee80211_mgd_stop(sdata); |
773 | } | 787 | } |