diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-18 07:21:23 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-06-18 07:21:23 -0400 |
| commit | 806e40edc517cfd8d6a1913ab585005607c2be9f (patch) | |
| tree | 9120ca669f5bb14f36caca66d4d3f8cd9fea67e9 /include/net/mac80211.h | |
| parent | 08e00400defab3122a1880653c05b037251d0611 (diff) | |
| parent | 22feaed11f1b0c58aab5df196c0bf011e7095a62 (diff) | |
Merge tag 'v3.4.92' into v3.4-rt
This is the 3.4.92 stable release
Conflicts:
include/linux/list.h
Diffstat (limited to 'include/net/mac80211.h')
| -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 9210bdc7bd8d..aa12b395b2b7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1174,6 +1174,10 @@ enum sta_notify_cmd { * @IEEE80211_HW_SCAN_WHILE_IDLE: The device can do hw scan while * being idle (i.e. mac80211 doesn't have to go idle-off during the * the scan). + * + * @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, @@ -1201,6 +1205,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_AP_LINK_PS = 1<<22, IEEE80211_HW_TX_AMPDU_SETUP_IN_HW = 1<<23, IEEE80211_HW_SCAN_WHILE_IDLE = 1<<24, + IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL = 1<<26, }; /** |