| Message ID | 1360759880-5669-2-git-send-email-michael-dev@fami-braun.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, 2013-02-13 at 13:51 +0100, Michael Braun wrote: > 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> > --- > V4: Add this patch. > V5: add spin_lock, switch order of patches > net/mac80211/iface.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c > index 40ff030..bb1cdc6 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, > struct sk_buff *skb, *tmp; > u32 hw_reconf_flags = 0; > int i, flushed; > + struct ps_data *ps; > > clear_bit(SDATA_STATE_RUNNING, &sdata->state); > > @@ -758,6 +759,19 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, > u.vlan.list) > dev_close(vlan->dev); > WARN_ON(!list_empty(&sdata->u.ap.vlans)); > + } else if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { > + /* remove all packets in parent bc_buf pointing to this dev */ > + ps = &sdata->bss->ps; > + > + spin_lock_irqsave(&ps->bc_buf.lock, flags); > + skb_queue_walk_safe(&ps->bc_buf, skb, tmp) { > + if (skb->dev == sdata->dev) { > + __skb_unlink(skb, &ps->bc_buf); > + local->total_ps_buffered--; > + kfree_skb(skb); Ok actually I guess I spoke too soon -- please also change kfree_skb() to ieee80211_free_txskb() johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 40ff030..bb1cdc6 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, struct sk_buff *skb, *tmp; u32 hw_reconf_flags = 0; int i, flushed; + struct ps_data *ps; clear_bit(SDATA_STATE_RUNNING, &sdata->state); @@ -758,6 +759,19 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, u.vlan.list) dev_close(vlan->dev); WARN_ON(!list_empty(&sdata->u.ap.vlans)); + } else if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { + /* remove all packets in parent bc_buf pointing to this dev */ + ps = &sdata->bss->ps; + + spin_lock_irqsave(&ps->bc_buf.lock, flags); + skb_queue_walk_safe(&ps->bc_buf, skb, tmp) { + if (skb->dev == sdata->dev) { + __skb_unlink(skb, &ps->bc_buf); + local->total_ps_buffered--; + kfree_skb(skb); + } + } + spin_unlock_irqrestore(&ps->bc_buf.lock, flags); } else if (sdata->vif.type == NL80211_IFTYPE_STATION) { ieee80211_mgd_stop(sdata); }
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> --- V4: Add this patch. V5: add spin_lock, switch order of patches net/mac80211/iface.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)