diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-03 00:59:37 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:33 -0400 |
| commit | 3434fbd39862d471c92b66c28cd449deea8e9f90 (patch) | |
| tree | 8a759cac10a7aa9400dfb2c3ab5153af1f7a10d5 /net/mac80211/tx.c | |
| parent | ca21614d4c7a176d3723ac211873020b3722dbda (diff) | |
| download | op-kernel-dev-3434fbd39862d471c92b66c28cd449deea8e9f90.zip op-kernel-dev-3434fbd39862d471c92b66c28cd449deea8e9f90.tar.gz | |
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/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f35eaea9..3a03d78 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1490,8 +1490,8 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, rcu_read_unlock(); } - /* receiver is QoS enabled, use a QoS type frame */ - if (sta_flags & WLAN_STA_WME) { + /* receiver and we are QoS enabled, use a QoS type frame */ + if (sta_flags & WLAN_STA_WME && local->hw.queues >= 4) { fc |= IEEE80211_STYPE_QOS_DATA; hdrlen += 2; } |
