diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-30 11:01:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-30 11:01:50 -0500 |
| commit | d47884a9de21c8db5cc86d5ca225864257eb193e (patch) | |
| tree | e4c276c7867ce2bf6312db5158bf41842842bec4 | |
| parent | cf01b78f837a561a27f70d099764998c17e602ec (diff) | |
| download | kernel-d47884a9de21c8db5cc86d5ca225864257eb193e.tar.gz kernel-d47884a9de21c8db5cc86d5ca225864257eb193e.tar.xz kernel-d47884a9de21c8db5cc86d5ca225864257eb193e.zip | |
ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix
| -rw-r--r-- | ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch | 29 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 35 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 00000000..7d5c9a5c --- /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@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@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 75723320..bf55811b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -749,6 +749,7 @@ Patch50003: compat-wireless-use-kconfig_h.patch Patch50004: compat-move-br_port_exists-to-compat-2_6_36_h.patch Patch50005: compat-wireless-fix-some-config-options.patch +Patch50100: ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch %endif @@ -1503,6 +1504,8 @@ ApplyPatch compat-wireless-use-kconfig_h.patch ApplyPatch compat-move-br_port_exists-to-compat-2_6_36_h.patch ApplyPatch compat-wireless-fix-some-config-options.patch +ApplyPatch ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch + cd .. %endif @@ -2278,6 +2281,9 @@ fi # ||----w | # || || %changelog +* Mon Jan 30 2012 John W. Linville <linville@redhat.com> +- ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix + * Sun Jan 29 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git5.1 - Linux 3.3-rc1-git5 (upstream 0a9626575400879d1d5e6bc8768188b938d7c501) |