diff options
| author | John W. Linville | 2012-12-11 22:24:55 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-12-11 22:24:55 +0100 |
| commit | f9c4d420c12de65e58a1a14ccee03e8b5cf99f5b (patch) | |
| tree | 7cfaf7e15f29c30919b1d4527862ce914619cbe2 /include/net | |
| parent | net: gro: avoid double copy in skb_gro_receive() (diff) | |
| parent | Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next (diff) | |
| download | kernel-qcow2-linux-f9c4d420c12de65e58a1a14ccee03e8b5cf99f5b.tar.gz kernel-qcow2-linux-f9c4d420c12de65e58a1a14ccee03e8b5cf99f5b.tar.xz kernel-qcow2-linux-f9c4d420c12de65e58a1a14ccee03e8b5cf99f5b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 1c02fb3b3817..ee50c5eba50c 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, }; /** |