summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorSara Sharon2018-04-20 12:49:19 +0200
committerJohannes Berg2018-05-07 20:35:15 +0200
commit914eac248d876f9c00cd1792ffec3d182c863f13 (patch)
tree348794992196e4ce0d020481626a1957a9fd3c73 /net/mac80211/tx.c
parentmac80211: Adjust SAE authentication timeout (diff)
downloadkernel-qcow2-linux-914eac248d876f9c00cd1792ffec3d182c863f13.tar.gz
kernel-qcow2-linux-914eac248d876f9c00cd1792ffec3d182c863f13.tar.xz
kernel-qcow2-linux-914eac248d876f9c00cd1792ffec3d182c863f13.zip
mac80211: use timeout from the AddBA response instead of the request
2016 spec, section 10.24.2 specifies that the block ack timeout in the ADD BA request is advisory. That means we should check the value in the response and act upon it (same as buffer size). Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 535de3161a78..05a265cd573d 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4,6 +4,7 @@
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
* Copyright 2013-2014 Intel Mobile Communications GmbH
+ * Copyright (C) 2018 Intel Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -1135,7 +1136,7 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
}
/* reset session timer */
- if (reset_agg_timer && tid_tx->timeout)
+ if (reset_agg_timer)
tid_tx->last_tx = jiffies;
return queued;