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

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

Merge 56847667 on remote branch 

Change-Id: I6f9e7dda099ba8f3320e5cb600e0530e8ff3f17e
parents ae018232 56847667

umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c

+5 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static QDF_STATUS vdev_mgr_start_param_update( 
	if ((op_mode == QDF_SAP_MODE || op_mode == QDF_P2P_GO_MODE) &&

	    (WLAN_REG_IS_5GHZ_CH_FREQ(des_chan->ch_freq) ||

	     WLAN_REG_IS_49GHZ_FREQ(des_chan->ch_freq) ||

	     WLAN_REG_IS_6GHZ_CHAN_FREQ(des_chan->ch_freq)))

	     WLAN_REG_IS_6GHZ_CHAN_FREQ(des_chan->ch_freq))) {

		tgt_dfs_set_current_channel_for_freq(pdev, des_chan->ch_freq,

						     des_chan->ch_flags,

						     des_chan->ch_flagext,
@@ -135,7 +135,10 @@ static QDF_STATUS vdev_mgr_start_param_update( 
						     des_chan->ch_freq_seg2,

						     des_chan->ch_cfreq1,

						     des_chan->ch_cfreq2);



		if (des_chan->ch_cfreq2)

			param->channel.dfs_set_cfreq2 =

				utils_is_dfs_cfreq2_ch(pdev);

	}

	param->beacon_interval = mlme_obj->proto.generic.beacon_interval;

	param->dtim_period = mlme_obj->proto.generic.dtim_period;

	param->disable_hw_ack = mlme_obj->mgmt.generic.disable_hw_ack;
@@ -155,7 +158,6 @@ static QDF_STATUS vdev_mgr_start_param_update( 
	param->channel.quarter_rate = mlme_obj->mgmt.rate_info.quarter_rate;

	param->channel.dfs_set = wlan_reg_is_dfs_for_freq(pdev,

							  des_chan->ch_freq);

	param->channel.dfs_set_cfreq2 = utils_is_dfs_cfreq2_ch(pdev);

	param->channel.is_chan_passive =

		utils_is_dfs_chan_for_freq(pdev, param->channel.mhz);

	param->channel.allow_ht = mlme_obj->proto.ht_info.allow_ht;

wmi/src/wmi_unified_nan_tlv.c

+7 −0
Original line number Diff line number Diff line
@@ -744,6 +744,13 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, 
		return QDF_STATUS_E_INVAL;

	}



	if (fixed_params->nan_scid_len > event->num_ndp_scid) {

		WMI_LOGE("FW msg ndp scid info len %d more than TLV hdr %d",

			 fixed_params->nan_scid_len,

			 event->num_ndp_scid);

		return QDF_STATUS_E_INVAL;

	}



	if (fixed_params->ndp_cfg_len >

		(WMI_SVC_MSG_MAX_SIZE - sizeof(*fixed_params))) {

		WMI_LOGE("%s: excess wmi buffer: ndp_cfg_len %d",

wmi/src/wmi_unified_tlv.c

+4 −3
Original line number Diff line number Diff line
@@ -1825,9 +1825,10 @@ static QDF_STATUS send_wow_enable_cmd_tlv(wmi_unified_t wmi_handle, 
		cmd->pause_iface_config = WOW_IFACE_PAUSE_DISABLED;

	cmd->flags = param->flags;



	WMI_LOGI("suspend type: %s",

	wmi_info("suspend type: %s flag is 0x%x",

		 cmd->pause_iface_config == WOW_IFACE_PAUSE_ENABLED ?

		"WOW_IFACE_PAUSE_ENABLED" : "WOW_IFACE_PAUSE_DISABLED");

		 "WOW_IFACE_PAUSE_ENABLED" : "WOW_IFACE_PAUSE_DISABLED",

		 cmd->flags);



	wmi_mtrace(WMI_WOW_ENABLE_CMDID, NO_SESSION, 0);

	ret = wmi_unified_cmd_send(wmi_handle, buf, len,