Commit 2b436312 authored May 23, 2013 by Johannes Berg

mac80211: fix queue handling crash



The code I added in "mac80211: don't start new netdev queues
if driver stopped" crashes for monitor and AP VLAN interfaces
because while they have a netdev, they don't have queues set
up by the driver.

To fix the crash, exclude these from queue accounting here
and just start their netdev queues unconditionally.

For monitor, this is the best we can do, as we can redirect
frames there to any other interface and don't know which one
that will since it can be different for each frame.

For AP VLAN interfaces, we can do better later and actually
properly track the queue status. Not doing this is really a
separate bug though.

Reported-by: Ilan Peer <ilan.peer@intel.com>
Reported-by: Jouni Malinen <j@w1.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent c8157976

net/mac80211/iface.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -653,7 +653,11 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)

	ieee80211_recalc_ps(local, -1);		ieee80211_recalc_ps(local, -1);

	if (dev) {		if (sdata->vif.type == NL80211_IFTYPE_MONITOR \|\|
			sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
			/* XXX: for AP_VLAN, actually track AP queues */
			netif_tx_start_all_queues(dev);
			} else if (dev) {
	unsigned long flags;		unsigned long flags;
	int n_acs = IEEE80211_NUM_ACS;		int n_acs = IEEE80211_NUM_ACS;
	int ac;		int ac;

Admin message