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

Commit 4c7d84ef authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 8dd3e59d on remote branch 

Change-Id: I6f32ab244d9ae4acedbf3f1401a18b3c58cb7ed5
parents 9dda4954 8dd3e59d

umac/scan/dispatcher/inc/wlan_scan_cfg.h

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ enum scan_mode_6ghz { 
 * mawc_nlo_enabled - For NLO/PNO, enable MAWC based scan

 * @Min: 0

 * @Max: 1

 * @Default: 1

 * @Default: 0

 *

 * Enable/Disable the Motion Aided Wireless Connectivity

 * based NLO using this parameter
@@ -745,7 +745,7 @@ enum scan_mode_6ghz { 
 */

#define CFG_MAWC_NLO_ENABLED CFG_INI_BOOL( \

			"mawc_nlo_enabled", \

			1, \

			0, \

			"Enable MAWC based scan")



/*

umac/scan/dispatcher/src/wlan_scan_utils_api.c

+12 −5
Original line number Diff line number Diff line
@@ -1319,7 +1319,7 @@ util_scan_add_hidden_ssid(struct wlan_objmgr_pdev *pdev, qdf_nbuf_t bcnbuf) 
	uint16_t tmplen, ie_length;

	uint8_t *pbeacon, *tmp;

	bool     set_ssid_flag = false;

	struct ie_ssid *ssid;

	struct ie_ssid ssid = {0};

	uint8_t pdev_id;



	if (!pdev) {
@@ -1368,8 +1368,15 @@ util_scan_add_hidden_ssid(struct wlan_objmgr_pdev *pdev, qdf_nbuf_t bcnbuf) 
						 sizeof(struct ie_header))) {

				return QDF_STATUS_E_INVAL;

			}

			ssid = (struct ie_ssid *)ie;

			if (util_scan_is_hidden_ssid(ssid)) {

			ssid.ssid_id = ie->ie_id;

			ssid.ssid_len = ie->ie_len;



			if (ssid.ssid_len)

				qdf_mem_copy(ssid.ssid,

					     ie + sizeof(struct ie_header),

					     ssid.ssid_len);



			if (util_scan_is_hidden_ssid(&ssid)) {

				set_ssid_flag  = true;

				ssid_ie_start_offset = bcn_ie_offset -

					sizeof(struct ie_header);
@@ -1396,7 +1403,7 @@ util_scan_add_hidden_ssid(struct wlan_objmgr_pdev *pdev, qdf_nbuf_t bcnbuf) 


	if (set_ssid_flag) {

		/* Hidden SSID if the Length is 0 */

		if (!ssid->ssid_len) {

		if (!ssid.ssid_len) {

			/* increase the taillength by length of ssid */

			if (qdf_nbuf_put_tail(bcnbuf,

					      conf_ssid->length) == NULL) {
@@ -1429,7 +1436,7 @@ util_scan_add_hidden_ssid(struct wlan_objmgr_pdev *pdev, qdf_nbuf_t bcnbuf) 
			qdf_mem_free(tmp);



			/* Hidden ssid with all 0's */

		} else if (ssid->ssid_len == conf_ssid->length) {

		} else if (ssid.ssid_len == conf_ssid->length) {

			/* Insert the  SSID string */

			qdf_mem_copy((pbeacon + ssid_ie_start_offset +

				      sizeof(struct ie_header)),

utils/fwlog/dbglog_host.c

+1 −1
Original line number Diff line number Diff line
@@ -1693,7 +1693,7 @@ process_fw_diag_event_data(uint8_t *datap, uint32_t num_data) 
	uint32_t diag_data_len; /* each fw diag payload */

	struct wlan_diag_data *diag_data;



	while (num_data > 0) {

	while (num_data >= sizeof(struct wlan_diag_data)) {

		diag_data = (struct wlan_diag_data *)datap;

		diag_type = WLAN_DIAG_0_TYPE_GET(diag_data->word0);

		diag_data_len = WLAN_DIAG_0_LEN_GET(diag_data->word0);

utils/nlink/src/wlan_nlink_srv.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ struct sk_buff * 
cld80211_oem_rsp_alloc_skb(uint32_t portid, void **hdr, struct nlattr **nest,

			   int *flags)

{

	static struct sk_buff *msg;

	struct sk_buff *msg;



	if (in_interrupt() || irqs_disabled() || in_atomic())

		*flags = GFP_ATOMIC;

wmi/src/wmi_unified_tlv.c

+3 −0
Original line number Diff line number Diff line
@@ -10891,6 +10891,9 @@ static QDF_STATUS extract_fips_event_data_tlv(wmi_unified_t wmi_handle, 
	param_buf = (WMI_PDEV_FIPS_EVENTID_param_tlvs *) evt_buf;

	event = (wmi_pdev_fips_event_fixed_param *) param_buf->fixed_param;



	if (event->data_len > param_buf->num_data)

		return QDF_STATUS_E_FAILURE;



	if (fips_conv_data_be(event->data_len, param_buf->data) !=

							QDF_STATUS_SUCCESS)

		return QDF_STATUS_E_FAILURE;