Commit 59034591 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: call set_wmm_default only for valid vifs 



mac80211 calls ieee80211_set_wmm_default (which in turn
calls drv_conf_tx()) for every new interface, including
"internal" ones (e.g. monitor interface, which the low-level
driver doesn't know about).

Limit this call only to valid interfaces.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3a8aea09

net/mac80211/iface.c

+8 −8
Original line number Diff line number Diff line
@@ -286,6 +286,13 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
			netif_carrier_off(dev);

		else

			netif_carrier_on(dev);



		/*

		 * set default queue parameters so drivers don't

		 * need to initialise the hardware if the hardware

		 * doesn't start up with sane defaults

		 */

		ieee80211_set_wmm_default(sdata);

	}



	set_bit(SDATA_STATE_RUNNING, &sdata->state);
@@ -329,15 +336,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
	if (coming_up)

		local->open_count++;



	if (hw_reconf_flags) {

	if (hw_reconf_flags)

		ieee80211_hw_config(local, hw_reconf_flags);

		/*

		 * set default queue parameters so drivers don't

		 * need to initialise the hardware if the hardware

		 * doesn't start up with sane defaults

		 */

		ieee80211_set_wmm_default(sdata);

	}



	ieee80211_recalc_ps(local, -1);