summaryrefslogtreecommitdiffstats
path: root/0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-10-09 10:28:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-10-09 10:29:38 -0400
commitb817316a0e458997d10a704d5463a710338de111 (patch)
treef1964a98d38f62da703ad03ca9824c23c6cdda77 /0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
parent821590a9f242e2159a7fc89a674bf8faa07fe92f (diff)
downloadkernel-b817316a0e458997d10a704d5463a710338de111.tar.gz
kernel-b817316a0e458997d10a704d5463a710338de111.tar.xz
kernel-b817316a0e458997d10a704d5463a710338de111.zip
Don't trigger a stack trace on crashing iwlwifi firmware (rhbz 896695)
Diffstat (limited to '0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch')
-rw-r--r--0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch b/0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
new file mode 100644
index 000000000..241b7d750
--- /dev/null
+++ b/0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch
@@ -0,0 +1,35 @@
+From 8ca95995e64f5d270889badb3e449dca91106a2b Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Sun, 15 Sep 2013 11:37:17 +0300
+Subject: [PATCH] iwlwifi: don't WARN on host commands sent when firmware is dead
+
+This triggers automatic bug reports and add no valuable
+information. Print a simple error instead and drop the
+host command.
+
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
+index dd57a36..80b4750 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
++++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
+@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
+ {
+ int ret;
+
+- WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
+- "%s bad state = %d", __func__, trans->state);
++ if (trans->state != IWL_TRANS_FW_ALIVE) {
++ IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
++ return -EIO;
++ }
+
+ if (!(cmd->flags & CMD_ASYNC))
+ lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
+--
+1.7.1
+