Merge "qcacld-3.0: Enable AMSDU in AMPDU support only in 11ax" into wlan-cld3.driver.lnx.2.0
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 9701157..0dca40b 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -4853,15 +4853,12 @@
#if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390)
#ifdef WLAN_FEATURE_11AX
-#define IS_PE_SESSION_11N_MODE(_session) \
- ((_session)->htCapability && !(_session)->vhtCapability && \
- !(_session)->he_capable)
+#define IS_PE_SESSION_HE_MODE(_session) ((_session)->he_capable)
#else
-#define IS_PE_SESSION_11N_MODE(_session) \
- ((_session)->htCapability && !(_session)->vhtCapability)
+#define IS_PE_SESSION_HE_MODE(_session) false
#endif /* WLAN_FEATURE_11AX */
#else
-#define IS_PE_SESSION_11N_MODE(_session) false
+#define IS_PE_SESSION_HE_MODE(_session) false
#endif
/**
@@ -4959,10 +4956,11 @@
session->active_ba_64_session = true;
}
- /* disable 11n RX AMSDU */
+ /* Enable RX AMSDU only in HE mode if supported */
if (mac_ctx->is_usr_cfg_amsdu_enabled &&
- !IS_PE_SESSION_11N_MODE(session) &&
- !WLAN_REG_IS_24GHZ_CH_FREQ(session->curr_op_freq))
+ ((IS_PE_SESSION_HE_MODE(session) &&
+ WLAN_REG_IS_24GHZ_CH_FREQ(session->curr_op_freq)) ||
+ WLAN_REG_IS_5GHZ_CH_FREQ(session->curr_op_freq)))
frm.addba_param_set.amsdu_supp = amsdu_support;
else
frm.addba_param_set.amsdu_supp = 0;