3.0-stable patches

added patches:
	ath9k-fix-rssi-dummy-marker-value.patch
	md-raid0-fix-error-return-from-create_stripe_zones.patch

diff --git a/queue-3.0/ath9k-fix-rssi-dummy-marker-value.patch b/queue-3.0/ath9k-fix-rssi-dummy-marker-value.patch
new file mode 100644 (file)
index 0000000..1425251
--- /dev/null
+++ b/queue-3.0/ath9k-fix-rssi-dummy-marker-value.patch
@@ -0,0 +1,34 @@
+From a3d63cadbad97671d740a9698acc2c95d1ca6e79 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Fri, 22 Feb 2013 21:09:17 +0100
+Subject: ath9k: fix RSSI dummy marker value
+
+From: Felix Fietkau <nbd@openwrt.org>
+
+commit a3d63cadbad97671d740a9698acc2c95d1ca6e79 upstream.
+
+RSSI is being stored internally as s8 in several places. The indication
+of an unset RSSI value, ATH_RSSI_DUMMY_MARKER, was supposed to have been
+set to 127, but ended up being set to 0x127 because of a code cleanup
+mistake. This could lead to invalid signal strength values in a few
+places.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath9k/common.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/ath9k/common.h
++++ b/drivers/net/wireless/ath/ath9k/common.h
+@@ -35,7 +35,7 @@
+ #define WME_AC_BK   3
+ #define WME_NUM_AC  4
+ 
+-#define ATH_RSSI_DUMMY_MARKER   0x127
++#define ATH_RSSI_DUMMY_MARKER   127
+ #define ATH_RSSI_LPF_LEN              10
+ #define RSSI_LPF_THRESHOLD            -20
+ #define ATH_RSSI_EP_MULTIPLIER     (1<<7)

diff --git a/queue-3.0/md-raid0-fix-error-return-from-create_stripe_zones.patch b/queue-3.0/md-raid0-fix-error-return-from-create_stripe_zones.patch
new file mode 100644 (file)
index 0000000..c15b430
--- /dev/null
+++ b/queue-3.0/md-raid0-fix-error-return-from-create_stripe_zones.patch
@@ -0,0 +1,40 @@
+From 58ebb34c49fcfcaa029e4b1c1453d92583900f9a Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Thu, 21 Feb 2013 15:36:38 +1100
+Subject: md: raid0: fix error return from create_stripe_zones.
+
+From: NeilBrown <neilb@suse.de>
+
+commit 58ebb34c49fcfcaa029e4b1c1453d92583900f9a upstream.
+
+Create_stripe_zones returns an error slightly differently to
+raid0_run and to raid0_takeover_*.
+
+The error returned used by the second was wrong and an error would
+result in mddev->private being set to NULL and sooner or later a
+crash.
+
+So never return NULL, return ERR_PTR(err), not NULL from
+create_stripe_zones.
+
+This bug has been present since 2.6.35 so the fix is suitable
+for any kernel since then.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/raid0.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/raid0.c
++++ b/drivers/md/raid0.c
+@@ -283,7 +283,7 @@ abort:
+       kfree(conf->strip_zone);
+       kfree(conf->devlist);
+       kfree(conf);
+-      *private_conf = NULL;
++      *private_conf = ERR_PTR(err);
+       return err;
+ }
+ 

diff --git a/queue-3.0/series b/queue-3.0/series
index 99e0687e8a77de3fe4f2a51371e3a1e23614a4d1..ceafac7dccec54b9fc9502ac671043313375431d 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -6,3 +6,5 @@ btrfs-init-io_lock-after-cloning-btrfs-device-struct.patch
 cifs-ensure-that-cifs_get_root-only-traverses-directories.patch
 sunrpc-don-t-start-the-retransmission-timer-when-out-of-socket-space.patch
 hw_random-make-buffer-usable-in-scatterlist.patch
+ath9k-fix-rssi-dummy-marker-value.patch
+md-raid0-fix-error-return-from-create_stripe_zones.patch