diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-03 11:30:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 11:30:57 -0500 |
| commit | b3047a77cba193658ebf534ee4abab9cb5446842 (patch) | |
| tree | 3d631c99faa0520c077046988fc40c9961546665 /net/mac80211/iface.c | |
| parent | 3d131f070948e4ad93189cb379b3a45d53dce71b (diff) | |
| parent | e4208427247ecc7306c8f71ab3c5c08e08cf9fda (diff) | |
| download | linux-b3047a77cba193658ebf534ee4abab9cb5446842.tar.bz2 | |
Merge tag 'mac80211-for-davem-2015-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Another set of fixes:
* remove a warning on a check that can trigger without any
errors having happened (Andrei)
* correctly handle deauth request while in the process of
associating (Andrei)
* fix TDLS HT operation (Arik)
* allow changing AID/listen interval during client setup (Ayala)
* be more forgiving with WMM parameters to get HT/VHT in case of
broken APs with bad WMM settings (Emmanuel, myself)
* a number of other fixes (some in documentation)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f848c75518a2..d0dc1bfaeec2 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -661,11 +661,13 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) } /* - * set default queue parameters so drivers don't + * Set default queue parameters so drivers don't * need to initialise the hardware if the hardware - * doesn't start up with sane defaults + * doesn't start up with sane defaults. + * Enable QoS for anything but station interfaces. */ - ieee80211_set_wmm_default(sdata, true); + ieee80211_set_wmm_default(sdata, true, + sdata->vif.type != NL80211_IFTYPE_STATION); } set_bit(SDATA_STATE_RUNNING, &sdata->state); |