ath10k: Update to kernel-4.1.26

fix debugfs pktlog_filter write fix firmware assert in monitor mode Signed-off-by: Philip J Perry <[email protected]>
elrepo · Jun 11, 2016 · 879dbed · 879dbed
1 parent e8a0323
commit 879dbed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ath10k-kmod/el7/ath10k-0.0/ath10k/debug.c b/ath10k-kmod/el7/ath10k-0.0/ath10k/debug.c
@@ -1947,7 +1947,12 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file,
 		goto out;
 	}
 
-	if (filter && (filter != ar->debug.pktlog_filter)) {
+	if (filter == ar->debug.pktlog_filter) {
+		ret = count;
+		goto out;
+	}
+
+	if (filter) {
 		ret = ath10k_wmi_pdev_pktlog_enable(ar, filter);
 		if (ret) {
 			ath10k_warn(ar, "failed to enable pktlog filter %x: %d\n",

diff --git a/ath10k-kmod/el7/ath10k-0.0/ath10k/mac.c b/ath10k-kmod/el7/ath10k-0.0/ath10k/mac.c
@@ -3329,7 +3329,10 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
 		goto err_vdev_delete;
 	}
 
-	if (ar->cfg_tx_chainmask) {
+	/* Configuring number of spatial stream for monitor interface is causing
+	 * target assert in qca9888 and qca6174.
+	 */
+	if (ar->cfg_tx_chainmask && (vif->type != NL80211_IFTYPE_MONITOR)) {
 		u16 nss = get_nss_from_chainmask(ar->cfg_tx_chainmask);
 
 		vdev_param = ar->wmi.vdev_param->nss;

diff --git a/ath10k-kmod/el7/ath10k-kmod.spec b/ath10k-kmod/el7/ath10k-kmod.spec
@@ -6,7 +6,7 @@
 
 Name:    %{kmod_name}-kmod
 Version: 0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   System Environment/Kernel
 License: GPLv2
 Summary: %{kmod_name} kernel module(s)
@@ -69,6 +69,11 @@ done
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Jun 11 2016 Philip J Perry <[email protected]> - 0.0-4
+- Update to kernel-4.1.26
+- fix debugfs pktlog_filter write
+- fix firmware assert in monitor mode
+
 * Wed Dec 09 2015 Philip J Perry <[email protected]> - 0.0-3
 - Fix invalid NSS for 4x4 devices, backported from kernel-4.1.14