diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-06-22 10:06:59 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-27 21:09:39 +0200 |
| commit | 04b7dcf979d71e870683c804802e44287a802760 (patch) | |
| tree | 41eed581c3e99d2de254aebe8d68e63c427aea62 /net/mac80211/wme.c | |
| parent | ssb: fix ssb clock rate according to broadcom source (diff) | |
| download | linux-04b7dcf979d71e870683c804802e44287a802760.tar.xz linux-04b7dcf979d71e870683c804802e44287a802760.zip | |
wireless: unify QoS control field definitions
Move all that mac80211 has into the generic
ieee80211.h header file and use them. At the
same time move them from mask+shift to just
bits and rename them for consistent names.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 28bc084dbfb9..7a49532f14cb 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -151,8 +151,7 @@ void ieee80211_set_qos_hdr(struct ieee80211_local *local, struct sk_buff *skb) tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; if (unlikely(local->wifi_wme_noack_test)) - ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK << - QOS_CONTROL_ACK_POLICY_SHIFT; + ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK; /* qos header is 2 bytes, second reserved */ *p++ = ack_policy | tid; *p = 0; |