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.h | |
| parent | 1049f6413f6e52572a768ca1590fa479ef0a48e8 (diff) | |
| parent | 9a4ba833a2d0016cf836827e136f0c219834bd41 (diff) | |
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.h')
| -rw-r--r-- | net/mac80211/wme.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h index 6053b1c9feee..faead6d02026 100644 --- a/net/mac80211/wme.h +++ b/net/mac80211/wme.h @@ -13,11 +13,6 @@ #include <linux/netdevice.h> #include "ieee80211_i.h" -#define QOS_CONTROL_ACK_POLICY_NORMAL 0 -#define QOS_CONTROL_ACK_POLICY_NOACK 1 - -#define QOS_CONTROL_ACK_POLICY_SHIFT 5 - extern const int ieee802_1d_to_ac[8]; u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, |