diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
tree | 39eb7e8e06737b295007126f4e16c1b688427163 /net/mac80211/wme.c | |
parent | myri10ge: Update MAINTAINERS (diff) | |
parent | rtlwifi: potential forever loop in rtl92de_hw_init() (diff) | |
download | linux-dev-df2cbe40753dc36af294c30209ed909869aca6cf.tar.xz linux-dev-df2cbe40753dc36af294c30209ed909869aca6cf.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
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; |