summaryrefslogtreecommitdiff
path: root/sys/net80211/ieee80211_proto.c
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2016-02-01 18:43:23 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2016-02-01 18:43:23 +0000
commitf35727ac23e8a14cf590226f2c9f42eefa969cf0 (patch)
treebb7d0372b187af98fef1e1e8a8ab4358aee829ea /sys/net80211/ieee80211_proto.c
parente9eeec8a4d7665cc782eefb4627b4f39688fc5d1 (diff)
Stop requiring a BlockAck session timeout. We still honour the timeout if
the AP requests it, though I don't think I've ever seen one that does. Per the 802.11-2012 spec a value of zero disables the timeout and some APs seem to have trouble with timeouts forced onto them. Our behaviour now matches Linux in this regard. This gets Apple Airport APs somewhat working in 11n mode but there is still a remaining issue with receiving frames from them. Doesn't seem to hurt any other APs I've tried. ok sthen@ mpi@ millert@
Diffstat (limited to 'sys/net80211/ieee80211_proto.c')
-rw-r--r--sys/net80211/ieee80211_proto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 2aa9ab90159..f469cecf710 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.60 2016/01/12 09:28:09 stsp Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.61 2016/02/01 18:43:22 stsp Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -641,7 +641,7 @@ ieee80211_addba_request(struct ieee80211com *ic, struct ieee80211_node *ni,
/* setup Block Ack */
ba->ba_state = IEEE80211_BA_REQUESTED;
ba->ba_token = ic->ic_dialog_token++;
- ba->ba_timeout_val = IEEE80211_BA_MAX_TIMEOUT;
+ ba->ba_timeout_val = 0;
timeout_set(&ba->ba_to, ieee80211_tx_ba_timeout, ba);
ba->ba_winsize = IEEE80211_BA_MAX_WINSZ;
ba->ba_winstart = ssn;