diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /include/linux | |
| parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
| parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
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 { | |||
| 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 | ||