drivers: staging: qca: Merge branch android-msm-sunfish-4.14-android1…

…3 (android-13.0.0_r0.41)

Signed-off-by: engstk <[email protected]>

drivers/staging/qcacld-3.0/core/mac/src/pe/lim/lim_assoc_utils.c

@@ -2546,6 +2546,22 @@ lim_add_sta(tpAniSirGlobal mac_ctx,
 			add_sta_params->stbc_capable = 0;
 	}
 
+	if (session_entry->pePersona == QDF_SAP_MODE ||
+	    session_entry->pePersona == QDF_P2P_GO_MODE) {
+		if (session_entry->parsedAssocReq) {
+			uint16_t aid = sta_ds->assocId;
+			/* Get a copy of the already parsed Assoc Request */
+			assoc_req =
+			(tpSirAssocReq) session_entry->parsedAssocReq[aid];
+
+			if (assoc_req) {
+				add_sta_params->wpa_rsn = assoc_req->rsnPresent;
+				add_sta_params->wpa_rsn |=
+					(assoc_req->wpaPresent << 1);
+			}
+		}
+	}
+
 	lim_update_he_stbc_capable(add_sta_params);
 
 	msg_q.type = WMA_ADD_STA_REQ;