aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-03-23 12:28:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-03-27 20:13:22 -0400
commitb1720231ca07dee3382980f3b25e6581bd2e54e9 (patch)
tree4258dec3d4774ee5968f181533c77766c8584b79 /include/net
parent1870cd71e87da1a1afb904f2c84086f487a07135 (diff)
mac80211: unify and fix TX aggregation start
When TX aggregation becomes operational, we do a number of steps: 1) print a debug message 2) wake the virtual queue 3) notify the driver Unfortunately, 1) and 3) are only done if the driver is first to reply to the aggregation request, it is, however, possible that the remote station replies before the driver! Thus, unify the code for this and call the new function ieee80211_agg_tx_operational in both places where TX aggregation can become operational. Additionally, rename the driver notification from IEEE80211_AMPDU_TX_RESUME to IEEE80211_AMPDU_TX_OPERATIONAL. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 6f3bc4cc53e5..07fe9875506e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1236,14 +1236,14 @@ enum ieee80211_filter_flags {
1236 * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation 1236 * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
1237 * @IEEE80211_AMPDU_TX_START: start Tx aggregation 1237 * @IEEE80211_AMPDU_TX_START: start Tx aggregation
1238 * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation 1238 * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
1239 * @IEEE80211_AMPDU_TX_RESUME: resume TX aggregation 1239 * @IEEE80211_AMPDU_TX_OPERATIONAL: TX aggregation has become operational
1240 */ 1240 */
1241enum ieee80211_ampdu_mlme_action { 1241enum ieee80211_ampdu_mlme_action {
1242 IEEE80211_AMPDU_RX_START, 1242 IEEE80211_AMPDU_RX_START,
1243 IEEE80211_AMPDU_RX_STOP, 1243 IEEE80211_AMPDU_RX_STOP,
1244 IEEE80211_AMPDU_TX_START, 1244 IEEE80211_AMPDU_TX_START,
1245 IEEE80211_AMPDU_TX_STOP, 1245 IEEE80211_AMPDU_TX_STOP,
1246 IEEE80211_AMPDU_TX_RESUME, 1246 IEEE80211_AMPDU_TX_OPERATIONAL,
1247}; 1247};
1248 1248
1249/** 1249/**