diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-11 16:04:03 -0500 |
commit | c66cfd5325bb215a251f4685fac8718b1da33197 (patch) | |
tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b /include/net | |
parent | ecbbec2eb093d2ef205de371af986f0360fca539 (diff) | |
parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 (diff) | |
download | linux-3.10-c66cfd5325bb215a251f4685fac8718b1da33197.tar.gz linux-3.10-c66cfd5325bb215a251f4685fac8718b1da33197.tar.bz2 linux-3.10-c66cfd5325bb215a251f4685fac8718b1da33197.zip |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/mac80211.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 1c02fb3b381..ee50c5eba50 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1369,6 +1369,10 @@ struct ieee80211_tx_control { * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any * P2P Interface. This will be honoured even if more than one interface * is supported. + * + * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session + * should be tear down once BAR frame will not be acked. + * */ enum ieee80211_hw_flags { IEEE80211_HW_HAS_RATE_CONTROL = 1<<0, @@ -1397,6 +1401,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23, IEEE80211_HW_SCAN_WHILE_IDLE = 1<<24, IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25, + IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL = 1<<26, }; /** |