aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-05-02 18:59:37 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-14 16:29:33 -0400
commit3434fbd39862d471c92b66c28cd449deea8e9f90 (patch)
tree8a759cac10a7aa9400dfb2c3ab5153af1f7a10d5 /net/mac80211/iface.c
parentca21614d4c7a176d3723ac211873020b3722dbda (diff)
mac80211: require four hardware queues for QoS/HT
This patch makes mac80211 only announce QoS/HT support when the underlying hardware has four (or more) queues. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: Ron Rindjunksi <ron.rindjunksi@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f41c7e0de62..5a9a3c6ef48 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -157,9 +157,10 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
157 ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN | 157 ifsta->auth_algs = IEEE80211_AUTH_ALG_OPEN |
158 IEEE80211_AUTH_ALG_SHARED_KEY; 158 IEEE80211_AUTH_ALG_SHARED_KEY;
159 ifsta->flags |= IEEE80211_STA_CREATE_IBSS | 159 ifsta->flags |= IEEE80211_STA_CREATE_IBSS |
160 IEEE80211_STA_WMM_ENABLED |
161 IEEE80211_STA_AUTO_BSSID_SEL | 160 IEEE80211_STA_AUTO_BSSID_SEL |
162 IEEE80211_STA_AUTO_CHANNEL_SEL; 161 IEEE80211_STA_AUTO_CHANNEL_SEL;
162 if (sdata->local->hw.queues >= 4)
163 ifsta->flags |= IEEE80211_STA_WMM_ENABLED;
163 164
164 msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev); 165 msdata = IEEE80211_DEV_TO_SUB_IF(sdata->local->mdev);
165 sdata->bss = &msdata->u.ap; 166 sdata->bss = &msdata->u.ap;