labbott pushed to kernel (f21). "Fix noisy iwlwifi warning (rhbz 1205083)"

[notifications at fedoraproject.org]

>From 7e2a10712783ffc29e3d25b0a383cb63cd929730 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott at fedoraproject.org>
Date: Wed, 22 Apr 2015 18:45:47 -0700
Subject: Fix noisy iwlwifi warning (rhbz 1205083)


diff --git a/0001-iwlwifi-mvm-remove-WARN_ON-for-invalid-BA-notificati.patch b/0001-iwlwifi-mvm-remove-WARN_ON-for-invalid-BA-notificati.patch
new file mode 100644
index 0000000..8dc4e89
--- /dev/null
+++ b/0001-iwlwifi-mvm-remove-WARN_ON-for-invalid-BA-notificati.patch
@@ -0,0 +1,34 @@
+From 1f16ea294d2ef63013740f4c8539e430b6c12dff Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg at intel.com>
+Date: Fri, 6 Mar 2015 09:17:37 +0100
+Subject: [PATCH] iwlwifi: mvm: remove WARN_ON for invalid BA notification
+
+The firmware frequently manages to trigger this, and there's
+no known driver workaround, so stop warning.
+
+Signed-off-by: Johannes Berg <johannes.berg at intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
+---
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
+index 07304e1..96a0540 100644
+--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
++++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
+@@ -949,8 +949,10 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
+ 	mvmsta = iwl_mvm_sta_from_mac80211(sta);
+ 	tid_data = &mvmsta->tid_data[tid];
+ 
+-	if (WARN_ONCE(tid_data->txq_id != scd_flow, "Q %d, tid %d, flow %d",
+-		      tid_data->txq_id, tid, scd_flow)) {
++	if (tid_data->txq_id != scd_flow) {
++		IWL_ERR(mvm,
++			"invalid BA notification: Q %d, tid %d, flow %d\n",
++			tid_data->txq_id, tid, scd_flow);
+ 		rcu_read_unlock();
+ 		return 0;
+ 	}
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index ee75176..b1800af 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -661,6 +661,9 @@ Patch26179: pty-Fix-input-race-when-closing.patch
 #rhbz 1210801
 Patch26180: HID-logitech-hidpp-add-a-module-parameter-to-keep-fi.patch
 
+#rhbz 1205083
+Patch26181: 0001-iwlwifi-mvm-remove-WARN_ON-for-invalid-BA-notificati.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1430,6 +1433,8 @@ ApplyPatch pty-Fix-input-race-when-closing.patch
 #rhbz 1210801
 ApplyPatch HID-logitech-hidpp-add-a-module-parameter-to-keep-fi.patch
 
+#rhbz 1205083
+ApplyPatch 0001-iwlwifi-mvm-remove-WARN_ON-for-invalid-BA-notificati.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2289,6 +2294,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Apr 23 2015 Laura Abbott <labbott at fedoraproject.com>
+- Fix noisy iwlwifi warning (rhbz 1205083)
+
 * Mon Apr 20 2015 Justin M. Forbes <jforbes at fedoraproject.org> - 3.19.5-200
 - Linux v3.19.5
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kernel.git/commit/?h=f21&id=7e2a10712783ffc29e3d25b0a383cb63cd929730