diff options
| author |   tobhe <tobhe@openbsd.org> | 2020-12-08 10:28:22 +0000 |
|---|---|---|
| committer | tobhe <tobhe@openbsd.org> | 2020-12-08 10:28:22 +0000 |
| commit | 19817d1926ab233fdff96cd474c595a885713e8c (patch) | |
| tree | a0e48806727b06fdf068625654360ee1a7fe2edd /sys | |
| parent | an(4): tsleep(9) -> tsleep_nsec(9) (diff) | |
| download | wireguard-openbsd-19817d1926ab233fdff96cd474c595a885713e8c.tar.xz wireguard-openbsd-19817d1926ab233fdff96cd474c595a885713e8c.zip | |
Use BA agreement immediately after it is requested by the AP.
Some APs continue to send QOS packet for the same tid (with normal ack
policy). Make those packets go through BA reordering to advance the
sequence number counter in the BA agreement and prevent performance loss
due to a gap wait later on.
Found by and fix from Christian Erhardt
ok stsp@ phessler@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 300b8880290..525756e6e02 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.221 2020/08/28 12:01:48 mvs Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.222 2020/12/08 10:28:22 tobhe Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -358,6 +358,17 @@ ieee80211_inputm(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, /* go through A-MPDU reordering */ ieee80211_input_ba(ic, m, ni, tid, rxi, ml); return; /* don't free m! */ + } else if (ba_state == IEEE80211_BA_REQUESTED && + (qos & IEEE80211_QOS_ACK_POLICY_MASK) == + IEEE80211_QOS_ACK_POLICY_NORMAL) { + /* + * Apparently, qos frames for a tid where a + * block ack agreement was requested but not + * yet confirmed by us should still contribute + * to the sequence number for this tid. + */ + ieee80211_input_ba(ic, m, ni, tid, rxi, ml); + return; /* don't free m! */ } } @@ -2698,6 +2709,9 @@ ieee80211_recv_addba_req(struct ieee80211com *ic, struct mbuf *m, ssn = LE_READ_2(&frm[7]) >> 4; ba = &ni->ni_rx_ba[tid]; + /* The driver is still processing an ADDBA request for this tid. */ + if (ba->ba_state == IEEE80211_BA_REQUESTED) + return; /* check if we already have a Block Ack agreement for this RA/TID */ if (ba->ba_state == IEEE80211_BA_AGREED) { /* XXX should we update the timeout value? */ @@ -2737,7 +2751,7 @@ ieee80211_recv_addba_req(struct ieee80211com *ic, struct mbuf *m, goto refuse; /* setup Block Ack agreement */ - ba->ba_state = IEEE80211_BA_INIT; + ba->ba_state = IEEE80211_BA_REQUESTED; ba->ba_timeout_val = timeout * IEEE80211_DUR_TU; ba->ba_ni = ni; ba->ba_token = token; @@ -2816,6 +2830,7 @@ ieee80211_addba_req_refuse(struct ieee80211com *ic, struct ieee80211_node *ni, free(ba->ba_buf, M_DEVBUF, IEEE80211_BA_MAX_WINSZ * sizeof(*ba->ba_buf)); ba->ba_buf = NULL; + ba->ba_state = IEEE80211_BA_INIT; /* MLME-ADDBA.response */ IEEE80211_SEND_ACTION(ic, ni, IEEE80211_CATEG_BA, |