[kernel/f16] ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix

John W. Linville linville at fedoraproject.org
Mon Jan 30 16:09:38 UTC 2012


commit 8377903fd0d90e2915c41e60a51e3319ece07e8f
Author: John W. Linville <linville at tuxdriver.com>
Date:   Mon Jan 30 11:08:12 2012 -0500

    ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix

 ...se-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch |   29 ++++++++++++++++++++
 kernel.spec                                        |    5 +++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch b/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
new file mode 100644
index 0000000..7d5c9a5
--- /dev/null
+++ b/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
@@ -0,0 +1,29 @@
+From 41b2d62702730b0c6bc5a40722e423bb0338311a Mon Sep 17 00:00:00 2001
+From: John W. Linville <linville at tuxdriver.com>
+Date: Mon, 30 Jan 2012 10:53:55 -0500
+Subject: [PATCH] ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix
+
+The device seems to survive the issue, so no need to flood the logs
+about it...
+
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/ath/ath9k/rc.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
+index b3c3798..635b592 100644
+--- a/drivers/net/wireless/ath/ath9k/rc.c
++++ b/drivers/net/wireless/ath/ath9k/rc.c
+@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc,
+ 		return rate;
+ 
+ 	/* This should not happen */
+-	WARN_ON(1);
++	WARN_ON_ONCE(1);
+ 
+ 	rate = ath_rc_priv->valid_rate_index[0];
+ 
+-- 
+1.7.4.4
+
diff --git a/kernel.spec b/kernel.spec
index bd6703c..7c2bd3b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -830,6 +830,8 @@ Patch50106: mac80211-update-oper_channel-on-ibss-join.patch
 Patch50107: mac80211-set-bss_conf.idle-when-vif-is-connected.patch
 Patch50108: iwlwifi-fix-PCI-E-transport-inta-race.patch
 
+Patch50200: ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1596,6 +1598,8 @@ ApplyPatch mac80211-update-oper_channel-on-ibss-join.patch
 ApplyPatch mac80211-set-bss_conf.idle-when-vif-is-connected.patch
 ApplyPatch iwlwifi-fix-PCI-E-transport-inta-race.patch
 
+ApplyPatch ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
+
 cd ..
 
 %endif
@@ -2311,6 +2315,7 @@ fi
 - mac80211: update oper_channel on ibss join
 - mac80211: set bss_conf.idle when vif is connected
 - iwlwifi: fix PCI-E transport "inta" race
+- ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix
 
 * Fri Jan 27 2012 John W. Linville <linville at redhat.com>
 - Include config.mk from compat-wireless build in files for installation


More information about the scm-commits mailing list