Skip to content

Commit

Permalink
mac80211: call set_wmm_default only for valid vifs
Browse files Browse the repository at this point in the history
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Eliad Peller authored and John W. Linville committed Nov 8, 2011
1 parent 3a8aea0 commit 5903459
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions net/mac80211/iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 5903459

Please sign in to comment.