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

Commit 99145aab authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ece8bc12 on remote branch 

Change-Id: Idabbebe09ab76856e178f3683ac06629ca23b352
parents eebd6edc ece8bc12

core/hdd/src/wlan_hdd_spectral.c

+12 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -391,7 +391,7 @@ static void __spectral_scan_msg_handler(const void *data, int data_len, 
					void *ctx, int pid)

{

	struct spectral_scan_msg *ss_msg = NULL;

	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX + 1];

	struct nlattr *tb[CLD80211_ATTR_MAX + 1];

	hdd_context_t *hdd_ctx;

	int ret;
@@ -400,6 +400,10 @@ static void __spectral_scan_msg_handler(const void *data, int data_len, 
	if (0 != ret)

		return;



	/*

	 * audit note: it is ok to pass a NULL policy here since only

	 * one attribute is parsed and it is explicitly validated

	 */

	if (hdd_nla_parse(tb, CLD80211_ATTR_MAX, data, data_len, NULL)) {

		hdd_err("nla parse fails");

		return;
@@ -409,6 +413,12 @@ static void __spectral_scan_msg_handler(const void *data, int data_len, 
		hdd_err("attr VENDOR_DATA fails");

		return;

	}



	if (nla_len(tb[CLD80211_ATTR_DATA]) < sizeof(*ss_msg)) {

		hdd_err("Invalid length for ATTR_DATA");

		return;

	}



	ss_msg = (struct spectral_scan_msg *)nla_data(tb[CLD80211_ATTR_DATA]);



	if (!ss_msg) {

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            1

#define QWLAN_VERSION_PATCH            1

#define QWLAN_VERSION_EXTRA            "Q"

#define QWLAN_VERSION_EXTRA            "R"

#define QWLAN_VERSION_BUILD            73



#define QWLAN_VERSIONSTR               "5.1.1.73Q"

#define QWLAN_VERSIONSTR               "5.1.1.73R"



#endif /* QWLAN_VERSION_H */

core/mac/inc/sir_mac_prot_def.h

+3 −0
Original line number Diff line number Diff line
@@ -406,6 +406,9 @@ 
#define VHT_MCS_1x1 0xFFFC

#define VHT_MCS_2x2 0xFFF3



/* Mask to check if BTM offload is enabled/disabled*/

#define BTM_OFFLOAD_ENABLED_MASK     0x01



#ifdef FEATURE_AP_MCC_CH_AVOIDANCE

#define SIR_MAC_QCOM_VENDOR_EID      200

#define SIR_MAC_QCOM_VENDOR_OUI      "\x00\xA0\xC6"

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

+0 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,6 @@ static QDF_STATUS lim_assoc_tx_complete_cnf(tpAniSirGlobal mac_ctx, 
 *

 * Return: Void

 */



void

lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,

			      tLimMlmAssocReq *mlm_assoc_req,

core/mac/src/sys/legacy/src/utils/src/parser_api.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -1215,6 +1215,9 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac, 
	if (psessionEntry && psessionEntry->enable_bcast_probe_rsp)

		p_ext_cap->fils_capability = 1;



	if (pMac->roam.configParam.btm_offload_config & BTM_OFFLOAD_ENABLED_MASK)

		p_ext_cap->bss_transition = 1;



	/* Need to calulate the num_bytes based on bits set */

	if (pDot11f->present)

		pDot11f->num_bytes = lim_compute_ext_cap_ie_length(pDot11f);