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

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

Merge d263f808 on remote branch 

Change-Id: Ib14330cc547cd7bd2aeeb88e2418a384debeafdd
parents 172ada45 d263f808

hif/src/ce/ce_service.c

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

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

 * Copyright (c) 2013-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
@@ -1999,6 +1999,7 @@ more_watermarks: 
					   CE_WATERMARK_MASK |

					   HOST_IS_COPY_COMPLETE_MASK);

	} else {

		qdf_atomic_set(&CE_state->rx_pending, 0);

		HIF_ERROR_RL(HIF_RATE_LIMIT_CE_ACCESS_LOG,

			"%s: target access is not allowed", __func__);

		goto unlock_end;

qdf/inc/qdf_nbuf.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct mon_rx_status { 
	uint8_t  beamformed;

	uint8_t  tx_status;

	bool add_rtap_ext;

	uint8_t  tx_retry_cnt;

};



/* DHCP Related Mask */

qdf/linux/src/qdf_nbuf.c

+4 −0
Original line number Diff line number Diff line
@@ -3418,6 +3418,7 @@ static unsigned int qdf_nbuf_update_radiotap_vht_flags( 
#define NORMALIZED_TO_NOISE_FLOOR (-96)



#define IEEE80211_RADIOTAP_TX_STATUS 0

#define IEEE80211_RADIOTAP_RETRY_COUNT 1



/* This is Radio Tap Header Extension Length.

 * 4 Bytes for Extended it_present bit map +
@@ -3534,9 +3535,12 @@ unsigned int qdf_nbuf_update_radiotap(struct mon_rx_status *rx_status, 
		rtap_ext = (uint32_t *)&rthdr->it_present;

		rtap_ext++;

		*rtap_ext = cpu_to_le32(1 << IEEE80211_RADIOTAP_TX_STATUS);

		*rtap_ext |= cpu_to_le32(1 << IEEE80211_RADIOTAP_RETRY_COUNT);



		rtap_buf[rtap_len] = rx_status->tx_status;

		rtap_len += 1;

		rtap_buf[rtap_len] = rx_status->tx_retry_cnt;

		rtap_len += 1;

	}



	rthdr->it_len = cpu_to_le16(rtap_len);

wmi/src/wmi_unified_tlv.c

+2 −2
Original line number Diff line number Diff line
@@ -10999,7 +10999,7 @@ QDF_STATUS send_enable_specific_fw_logs_cmd_tlv(wmi_unified_t wmi_handle, 
	count = 0;



	if (!wmi_handle->events_logs_list) {

		WMI_LOGE("%s: Not received event/log list from FW, yet",

		WMI_LOGD("%s: Not received event/log list from FW, yet",

				__func__);

		return QDF_STATUS_E_NOMEM;

	}
@@ -14255,7 +14255,7 @@ QDF_STATUS send_limit_off_chan_cmd_tlv(wmi_unified_t wmi_handle, 
	cmd->max_offchan_time = limit_off_chan_param->max_offchan_time;

	cmd->rest_time = limit_off_chan_param->rest_time;



	WMI_LOGE("%s: vdev_id=%d, flags =%x, max_offchan_time=%d, rest_time=%d",

	WMI_LOGD("%s: vdev_id=%d, flags =%x, max_offchan_time=%d, rest_time=%d",

		__func__, cmd->vdev_id, cmd->flags, cmd->max_offchan_time,

		cmd->rest_time);