diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-28 05:04:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-10 14:56:10 -0400 |
commit | 32c5057b22a60b23353dda93c57e475856ca286c (patch) | |
tree | 68a80dd3fb3a93f0eacf1566c3dd60877efe6cf2 /net/mac80211/wme.c | |
parent | 4644ae89033872a62b4fea6ca96b958e115efdc0 (diff) |
mac80211: use IEEE80211_NUM_ACS
When comparing hw->queues to determine if the
device is QoS capable, use IEEE80211_NUM_ACS
instead of just 4.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.c')
-rw-r--r-- | net/mac80211/wme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 16b48395a468..c3d643a6536c 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
@@ -79,7 +79,7 @@ u16 ieee80211_select_queue_80211(struct ieee80211_local *local, | |||
79 | { | 79 | { |
80 | u8 *p; | 80 | u8 *p; |
81 | 81 | ||
82 | if (local->hw.queues < 4) | 82 | if (local->hw.queues < IEEE80211_NUM_ACS) |
83 | return 0; | 83 | return 0; |
84 | 84 | ||
85 | if (!ieee80211_is_data(hdr->frame_control)) { | 85 | if (!ieee80211_is_data(hdr->frame_control)) { |
@@ -106,7 +106,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, | |||
106 | const u8 *ra = NULL; | 106 | const u8 *ra = NULL; |
107 | bool qos = false; | 107 | bool qos = false; |
108 | 108 | ||
109 | if (local->hw.queues < 4 || skb->len < 6) { | 109 | if (local->hw.queues < IEEE80211_NUM_ACS || skb->len < 6) { |
110 | skb->priority = 0; /* required for correct WPA/11i MIC */ | 110 | skb->priority = 0; /* required for correct WPA/11i MIC */ |
111 | return 0; | 111 | return 0; |
112 | } | 112 | } |