diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-18 16:28:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-18 16:28:31 -0800 |
| commit | a5db219f4cf9f67995eabd53b81a1232c82f5852 (patch) | |
| tree | 5fffcb7ebd543b39468822963f9190fe6bf41bff /include/linux | |
| parent | Linux 2.6.38-rc1 (diff) | |
| parent | gianfar: Fix misleading indentation in startup_gfar() (diff) | |
| download | linux-dev-a5db219f4cf9f67995eabd53b81a1232c82f5852.tar.xz linux-dev-a5db219f4cf9f67995eabd53b81a1232c82f5852.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 6042228954a7..294169e31364 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 |