Page MenuHomeFreeBSD
Files F142138198

D49829.id153657.diff
No OneTemporary
Actions

D49829.id153657.diff
View Options

diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -214,7 +214,7 @@
* frames will always have sequence numbers allocated from the NON_QOS
* TID.
*/
- if (do_ampdu) {
+ if (!IEEE80211_CONF_AMPDU_OFFLOAD(ic) && do_ampdu) {
if ((m->m_flags & M_EAPOL) == 0 && (! mcast)) {
int tid = WME_AC_TO_TID(M_WME_GETAC(m));
struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[tid];
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -100,6 +100,8 @@
((ic)->ic_flags_ext & IEEE80211_FEXT_SEQNO_OFFLOAD)
#define IEEE80211_CONF_FRAG_OFFLOAD(ic) \
((ic)->ic_flags_ext & IEEE80211_FEXT_FRAG_OFFLOAD)
+#define IEEE80211_CONF_AMPDU_OFFLOAD(ic) \
+ ((ic)->ic_flags_ext & IEEE80211_FEXT_AMPDU_OFFLOAD)
/*
* 802.11 control state is split into a common portion that maps
@@ -697,13 +699,14 @@
#define IEEE80211_FEXT_VHT 0x00400000 /* CONF: VHT support */
#define IEEE80211_FEXT_QUIET_IE 0x00800000 /* STATUS: quiet IE in a beacon has been added */
#define IEEE80211_FEXT_UAPSD 0x01000000 /* CONF: enable U-APSD */
+#define IEEE80211_FEXT_AMPDU_OFFLOAD 0x02000000 /* CONF: driver/fw handles AMPDU[-TX] itself */
#define IEEE80211_FEXT_BITS \
"\20\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \
"\0114ADDR\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\16STATEWAIT\17REINIT" \
"\20BPF\21WDSLEGACY\22PROBECHAN\23UNIQMAC\24SCAN_OFFLOAD\25SEQNO_OFFLOAD" \
"\26FRAG_OFFLOAD\27VHT" \
- "\30QUIET_IE\31UAPSD"
+ "\30QUIET_IE\31UAPSD\32AMPDU_OFFLOAD"
/* ic_flags_ht/iv_flags_ht */
#define IEEE80211_FHT_NONHT_PR 0x00000001 /* STATUS: non-HT sta present */

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 9:43 AM (1 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27681664
Default Alt Text
D49829.id153657.diff (1 KB)

Event Timeline