diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-18 19:28:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-18 19:28:31 -0500 |
| commit | a5db219f4cf9f67995eabd53b81a1232c82f5852 (patch) | |
| tree | 5fffcb7ebd543b39468822963f9190fe6bf41bff /include | |
| parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) | |
| parent | ff76015f3bdfbc482c723cb4f2559cef84d178ca (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -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 { | |||
| 959 | /* block-ack parameters */ | 959 | /* block-ack parameters */ |
| 960 | #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 | 960 | #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002 |
| 961 | #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C | 961 | #define IEEE80211_ADDBA_PARAM_TID_MASK 0x003C |
| 962 | #define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFA0 | 962 | #define IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK 0xFFC0 |
| 963 | #define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 | 963 | #define IEEE80211_DELBA_PARAM_TID_MASK 0xF000 |
| 964 | #define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 | 964 | #define IEEE80211_DELBA_PARAM_INITIATOR_MASK 0x0800 |
| 965 | 965 | ||