summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-18 12:50:19 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-18 12:50:19 -0800
commitf966a13f92913ce8cbd35bc7f066553c9f3d41b0 (patch)
tree5039770cf62f69317c974775190cc4f5919f8398 /include
parent7e96fbf2320782fb8f0970928026105cd34b41bd (diff)
parent38d59392b29437af3a702209b6a5196ef01f79a8 (diff)
downloadlinux-3.10-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.gz
linux-3.10-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.tar.bz2
linux-3.10-f966a13f92913ce8cbd35bc7f066553c9f3d41b0.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/ieee80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 6042228954a..294169e3136 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -959,7 +959,7 @@ struct ieee80211_ht_info {
/* block-ack parameters */
#define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
#define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C
-#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0
+#define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0
#define IEEE80211_DELBA_PARAM_TID_MASK 0xF000
#define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800