diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-07-01 07:16:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-08 10:21:34 -0400 |
commit | 429a380571a6e6b8525b93161544eafc9b227e44 (patch) | |
tree | a90ad1cba6ea557ace90a74ea02af9d5bcad36c1 /include | |
parent | b2898a27809f54a33050a70d0eaa4a78194163a0 (diff) |
mac80211: add block ack request capability
This patch adds block ack request capability
Signed-off-by: Ester Kummer <ester.kummer@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ieee80211.h | 4 | ||||
-rw-r--r-- | include/net/mac80211.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index cffd6d0094f9..aa603c3d76d1 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
@@ -658,6 +658,10 @@ struct ieee80211_bar { | |||
658 | __le16 start_seq_num; | 658 | __le16 start_seq_num; |
659 | } __attribute__((packed)); | 659 | } __attribute__((packed)); |
660 | 660 | ||
661 | /* 802.11 BAR control masks */ | ||
662 | #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 | ||
663 | #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 | ||
664 | |||
661 | /** | 665 | /** |
662 | * struct ieee80211_ht_cap - HT capabilities | 666 | * struct ieee80211_ht_cap - HT capabilities |
663 | * | 667 | * |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 3a204acad901..0a5de3ef527a 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -235,6 +235,8 @@ struct ieee80211_bss_conf { | |||
235 | * @IEEE80211_TX_STAT_ACK: Frame was acknowledged | 235 | * @IEEE80211_TX_STAT_ACK: Frame was acknowledged |
236 | * @IEEE80211_TX_STAT_AMPDU: The frame was aggregated, so status | 236 | * @IEEE80211_TX_STAT_AMPDU: The frame was aggregated, so status |
237 | * is for the whole aggregation. | 237 | * is for the whole aggregation. |
238 | * @IEEE80211_TX_STAT_AMPDU_NO_BACK: no block ack was returned, | ||
239 | * so consider using block ack request (BAR). | ||
238 | */ | 240 | */ |
239 | enum mac80211_tx_control_flags { | 241 | enum mac80211_tx_control_flags { |
240 | IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), | 242 | IEEE80211_TX_CTL_REQ_TX_STATUS = BIT(0), |
@@ -260,6 +262,7 @@ enum mac80211_tx_control_flags { | |||
260 | IEEE80211_TX_STAT_TX_FILTERED = BIT(20), | 262 | IEEE80211_TX_STAT_TX_FILTERED = BIT(20), |
261 | IEEE80211_TX_STAT_ACK = BIT(21), | 263 | IEEE80211_TX_STAT_ACK = BIT(21), |
262 | IEEE80211_TX_STAT_AMPDU = BIT(22), | 264 | IEEE80211_TX_STAT_AMPDU = BIT(22), |
265 | IEEE80211_TX_STAT_AMPDU_NO_BACK = BIT(23), | ||
263 | }; | 266 | }; |
264 | 267 | ||
265 | 268 | ||