Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ae6784b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4285c3db on remote branch 

Change-Id: I50a7bdf1ed3ca2b8bc1bddce9079c970ef06fb98
parents 399a6bb3 4285c3db

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include <wmi_unified_param.h>

#include <sir_api.h>



#define OWE_TRANSITION_OUI_TYPE "\x50\x6f\x9a\x1c"

#define OWE_TRANSITION_OUI_SIZE 4



#define CFG_PMKID_MODES_OKC                        (0x1)

#define CFG_PMKID_MODES_PMKSA_CACHING              (0x2)

core/dp/txrx/ol_txrx.c

+0 −9
Original line number Diff line number Diff line
@@ -1439,15 +1439,6 @@ ol_txrx_pdev_post_attach(struct cdp_soc_t *soc_hdl, uint8_t pdev_id) 
	 */

	qdf_mem_zero(&pdev->rx_pn[0], sizeof(pdev->rx_pn));



	/* WEP: 24-bit PN */

	pdev->rx_pn[htt_sec_type_wep40].len =

		pdev->rx_pn[htt_sec_type_wep104].len =

			pdev->rx_pn[htt_sec_type_wep128].len = 24;



	pdev->rx_pn[htt_sec_type_wep40].cmp =

		pdev->rx_pn[htt_sec_type_wep104].cmp =

			pdev->rx_pn[htt_sec_type_wep128].cmp = ol_rx_pn_cmp24;



	/* TKIP: 48-bit TSC, CCMP: 48-bit PN */

	pdev->rx_pn[htt_sec_type_tkip].len =

		pdev->rx_pn[htt_sec_type_tkip_nomic].len =

core/mac/inc/qwlan_version.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#define QWLAN_VERSION_MAJOR            5

#define QWLAN_VERSION_MINOR            2

#define QWLAN_VERSION_PATCH            022

#define QWLAN_VERSION_EXTRA            "I"

#define QWLAN_VERSION_EXTRA            "N"

#define QWLAN_VERSION_BUILD            8



#define QWLAN_VERSIONSTR               "5.2.022.8I"

#define QWLAN_VERSIONSTR               "5.2.022.8N"



#endif /* QWLAN_VERSION_H */

core/mac/src/pe/lim/lim_process_beacon_frame.c

+18 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ lim_process_beacon_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, 
{

	tpSirMacMgmtHdr mac_hdr;

	tSchBeaconStruct *bcn_ptr;

	uint8_t *frame;

	const uint8_t *owe_transition_ie;

	uint16_t frame_len;



	mac_ctx->lim.gLimNumBeaconsRcvd++;
@@ -67,6 +70,8 @@ lim_process_beacon_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, 
	 * beacon counter

	 */

	mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);

	frame = WMA_GET_RX_MPDU_DATA(rx_pkt_info);

	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);



	pe_debug("Beacon (len %d): " QDF_MAC_ADDR_FMT " RSSI %d",

		 WMA_GET_RX_MPDU_LEN(rx_pkt_info),
@@ -114,6 +119,19 @@ lim_process_beacon_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, 


	if (session->limMlmState ==

			eLIM_MLM_WT_JOIN_BEACON_STATE) {

		owe_transition_ie = wlan_get_vendor_ie_ptr_from_oui(

					OWE_TRANSITION_OUI_TYPE,

					OWE_TRANSITION_OUI_SIZE,

					frame + SIR_MAC_B_PR_SSID_OFFSET,

					frame_len - SIR_MAC_B_PR_SSID_OFFSET);

		if (session->connected_akm == ANI_AKM_TYPE_OWE &&

		    owe_transition_ie) {

			pe_debug("vdev:%d Drop OWE rx beacon. Wait for probe for join success",

				 session->vdev_id);

			qdf_mem_free(bcn_ptr);

			return;

		}



		if (session->beacon) {

			qdf_mem_free(session->beacon);

			session->beacon = NULL;

core/sme/src/rrm/sme_rrm.c

+7 −0
Original line number Diff line number Diff line
@@ -863,6 +863,13 @@ sme_rrm_issue_scan_req(struct mac_context *mac_ctx, uint8_t idx) 
		struct wlan_objmgr_vdev *vdev;

		uint32_t freq;



		if (!sme_rrm_ctx->channelList.numOfChannels ||

		    !sme_rrm_ctx->channelList.freq_list) {

			sme_err("[802.11 RRM]: Global freq list is null");

			status = QDF_STATUS_E_FAILURE;

			goto send_ind;

		}



		req = qdf_mem_malloc(sizeof(*req));

		if (!req) {

			status = QDF_STATUS_E_NOMEM;