Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397a7a24 authored by Michael Braun's avatar Michael Braun Committed by Johannes Berg
Browse files

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: default avatarMichael Braun <michael-dev@fami-braun.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 164eb02d

net/mac80211/iface.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -680,6 +680,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	struct sk_buff *skb, *tmp;

	struct sk_buff *skb, *tmp;

	u32 hw_reconf_flags = 0;

	u32 hw_reconf_flags = 0;

	int i, flushed;

	int i, flushed;

	struct ps_data *ps;





	clear_bit(SDATA_STATE_RUNNING, &sdata->state);

	clear_bit(SDATA_STATE_RUNNING, &sdata->state);
@@ -768,6 +769,19 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
					 u.vlan.list)

					 u.vlan.list)

			dev_close(vlan->dev);

			dev_close(vlan->dev);

		WARN_ON(!list_empty(&sdata->u.ap.vlans));

		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--;

				ieee80211_free_txskb(&local->hw, skb);

			}

		}

		spin_unlock_irqrestore(&ps->bc_buf.lock, flags);

	} else if (sdata->vif.type == NL80211_IFTYPE_STATION) {

	} else if (sdata->vif.type == NL80211_IFTYPE_STATION) {

		ieee80211_mgd_stop(sdata);

		ieee80211_mgd_stop(sdata);

	}

	}