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

Commit bf083c8e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: ath10k: move pktlog_filter out of ath10k_debug"

parents e42db29a 8addec22

drivers/net/wireless/ath/ath10k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ struct ath10k_debug { 
	/* protected by conf_mutex */

	u64 fw_dbglog_mask;

	u32 fw_dbglog_level;

	u32 pktlog_filter;

	u32 reg_addr;

	u32 nf_cal_period;

	void *cal_data;
@@ -959,6 +958,7 @@ struct ath10k { 
	} spectral;

#endif



	u32 pktlog_filter;

	struct {

		/* protected by conf_mutex */

		struct ath10k_fw_components utf_mode_fw;

drivers/net/wireless/ath/ath10k/debug.c

+8 −8
Original line number Diff line number Diff line
@@ -1958,14 +1958,14 @@ int ath10k_debug_start(struct ath10k *ar) 
				    ret);

	}



	if (ar->debug.pktlog_filter) {

	if (ar->pktlog_filter) {

		ret = ath10k_wmi_pdev_pktlog_enable(ar,

						    ar->debug.pktlog_filter);

						    ar->pktlog_filter);

		if (ret)

			/* not serious */

			ath10k_warn(ar,

				    "failed to enable pktlog filter %x: %d\n",

				    ar->debug.pktlog_filter, ret);

				    ar->pktlog_filter, ret);

	} else {

		ret = ath10k_wmi_pdev_pktlog_disable(ar);

		if (ret)
@@ -2105,12 +2105,12 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, 
	mutex_lock(&ar->conf_mutex);



	if (ar->state != ATH10K_STATE_ON) {

		ar->debug.pktlog_filter = filter;

		ar->pktlog_filter = filter;

		ret = count;

		goto out;

	}



	if (filter == ar->debug.pktlog_filter) {

	if (filter == ar->pktlog_filter) {

		ret = count;

		goto out;

	}
@@ -2119,7 +2119,7 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, 
		ret = ath10k_wmi_pdev_pktlog_enable(ar, filter);

		if (ret) {

			ath10k_warn(ar, "failed to enable pktlog filter %x: %d\n",

				    ar->debug.pktlog_filter, ret);

				    ar->pktlog_filter, ret);

			goto out;

		}

	} else {
@@ -2130,7 +2130,7 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, 
		}

	}



	ar->debug.pktlog_filter = filter;

	ar->pktlog_filter = filter;

	ret = count;



out:
@@ -2147,7 +2147,7 @@ static ssize_t ath10k_read_pktlog_filter(struct file *file, char __user *ubuf, 


	mutex_lock(&ar->conf_mutex);

	len = scnprintf(buf, sizeof(buf) - len, "%08x\n",

			ar->debug.pktlog_filter);

			ar->pktlog_filter);

	mutex_unlock(&ar->conf_mutex);



	return simple_read_from_buffer(ubuf, count, ppos, buf, len);