diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2021-09-23 15:13:48 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2021-09-23 15:13:48 +0000 |
| commit | 548833c81b3955f9954ddba7074e871565ed2245 (patch) | |
| tree | 2cf62e9e612293eb59cb992346110cc9ba938468 /sys/net80211 | |
| parent | 537a195eb57739b95c2a6c2355ca720563203243 (diff) | |
Add an ADDBA_OFFLOAD capability for wifi devices manage Tx block ack
sessions entirely in firmware. This will be used by iwx(4).
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 21 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_var.h | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index bf7abf058b8..17d3fb902d5 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.c,v 1.102 2021/04/25 15:32:21 stsp Exp $ */ +/* $OpenBSD: ieee80211_proto.c,v 1.103 2021/09/23 15:13:47 stsp Exp $ */ /* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */ /*- @@ -700,6 +700,18 @@ ieee80211_addba_request(struct ieee80211com *ic, struct ieee80211_node *ni, /* immediate BA */ ba->ba_params |= IEEE80211_ADDBA_BA_POLICY; + if ((ic->ic_caps & IEEE80211_C_ADDBA_OFFLOAD) && + ic->ic_ampdu_tx_start != NULL) { + int err = ic->ic_ampdu_tx_start(ic, ni, tid); + if (err && err != EBUSY) { + /* driver failed to setup, rollback */ + ieee80211_addba_resp_refuse(ic, ni, tid, + IEEE80211_STATUS_UNSPECIFIED); + } else if (err == 0) + ieee80211_addba_resp_accept(ic, ni, tid); + return err; /* The device will send an ADDBA frame. */ + } + timeout_add_sec(&ba->ba_to, 1); /* dot11ADDBAResponseTimeout */ IEEE80211_SEND_ACTION(ic, ni, IEEE80211_CATEG_BA, IEEE80211_ACTION_ADDBA_REQ, tid); @@ -948,6 +960,13 @@ ieee80211_stop_ampdu_tx(struct ieee80211com *ic, struct ieee80211_node *ni, struct ieee80211_tx_ba *ba = &ni->ni_tx_ba[tid]; if (ba->ba_state != IEEE80211_BA_AGREED) continue; + + if (ic->ic_caps & IEEE80211_C_ADDBA_OFFLOAD) { + if (ic->ic_ampdu_tx_stop != NULL) + ic->ic_ampdu_tx_stop(ic, ni, tid); + continue; /* Don't change ba->ba_state! */ + } + ieee80211_delba_request(ic, ni, mgt == -1 ? 0 : IEEE80211_REASON_AUTH_LEAVE, 1, tid); } diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 334439887ff..c4c25512cef 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_var.h,v 1.104 2021/05/17 11:44:22 stsp Exp $ */ +/* $OpenBSD: ieee80211_var.h,v 1.105 2021/09/23 15:13:47 stsp Exp $ */ /* $NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $ */ /*- @@ -432,6 +432,7 @@ struct ieee80211_ess { #define IEEE80211_C_RAWCTL 0x00004000 /* CAPABILITY: raw ctl */ #define IEEE80211_C_SCANALLBAND 0x00008000 /* CAPABILITY: scan all bands */ #define IEEE80211_C_TX_AMPDU 0x00010000 /* CAPABILITY: send A-MPDU */ +#define IEEE80211_C_ADDBA_OFFLOAD 0x00020000 /* CAPABILITY: ADDBA offload */ /* flags for ieee80211_fix_rate() */ #define IEEE80211_F_DOSORT 0x00000001 /* sort rate list */ |