diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 09:52:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 09:52:37 +0200 |
| commit | f42a44494bcdf03fc851c03d438464d59c0ceaf5 (patch) | |
| tree | 986ea7b54e9fc79a64863fd7e92eabd99ffd37a3 /net/mac80211/iface.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/... (diff) | |
| parent | libertas: remove lbs_get_data_rate() (diff) | |
| download | linux-f42a44494bcdf03fc851c03d438464d59c0ceaf5.tar.xz linux-f42a44494bcdf03fc851c03d438464d59c0ceaf5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 4a8062f8b1cc..3c64e42eb12e 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -166,9 +166,10 @@ void ieee80211_if_set_type(struct net_device *dev, int type) ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN | IEEE80211_AUTH_ALG_SHARED_KEY; ifsta->flags |= IEEE80211_STA_CREATE_IBSS | - IEEE80211_STA_WMM_ENABLED | IEEE80211_STA_AUTO_BSSID_SEL | IEEE80211_STA_AUTO_CHANNEL_SEL; + if (sdata->local->hw.queues >= 4) + ifsta->flags |= IEEE80211_STA_WMM_ENABLED; msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev); sdata->bss = &msdata->u.ap; |