From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Mar 2013 21:22:02 +0000 (-0700)
Subject: 3.8-stable patches
X-Git-Tag: v3.0.71~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=490d45281d344f263642dad97139e3f45b392cf7;p=thirdparty%2Fkernel%2Fstable-queue.git

3.8-stable patches

added patches:
	rt2x00-error-in-configurations-with-mesh-support-disabled.patch
---

diff --git a/queue-3.8/rt2x00-error-in-configurations-with-mesh-support-disabled.patch b/queue-3.8/rt2x00-error-in-configurations-with-mesh-support-disabled.patch
new file mode 100644
index 00000000000..5ca3705a695
--- /dev/null
+++ b/queue-3.8/rt2x00-error-in-configurations-with-mesh-support-disabled.patch
@@ -0,0 +1,39 @@
+From 6ef9e2f6d12ce9e2120916804d2ddd46b954a70b Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@openwrt.org>
+Date: Tue, 26 Feb 2013 16:09:55 +0100
+Subject: rt2x00: error in configurations with mesh support disabled
+
+From: Felix Fietkau <nbd@openwrt.org>
+
+commit 6ef9e2f6d12ce9e2120916804d2ddd46b954a70b upstream.
+
+If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising
+interface combinations with NL80211_IFTYPE_MESH_POINT present.
+Add appropriate ifdefs to avoid running into errors.
+
+[Backported for 3.8-stable. Removed code of simultaneous AP and mesh
+mode added in 4a5fc6d 3.9-rc1.]
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
+Reviewed-by: CAI Qian <caiqian@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/rt2x00/rt2x00dev.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -1209,7 +1209,9 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ 		rt2x00dev->hw->wiphy->interface_modes |=
+ 		    BIT(NL80211_IFTYPE_ADHOC) |
+ 		    BIT(NL80211_IFTYPE_AP) |
++#ifdef CONFIG_MAC80211_MESH
+ 		    BIT(NL80211_IFTYPE_MESH_POINT) |
++#endif
+ 		    BIT(NL80211_IFTYPE_WDS);
+ 
+ 	rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
diff --git a/queue-3.8/series b/queue-3.8/series
index 17e0e0a33aa..d32d01edb13 100644
--- a/queue-3.8/series
+++ b/queue-3.8/series
@@ -95,3 +95,4 @@ usb-garmin_gps-fix-memory-leak-on-disconnect.patch
 usb-io_ti-fix-get_icount-for-two-port-adapters.patch
 usb-musb-da8xx-fix-build-breakage-due-to-typo.patch
 arm-dma-mapping-add-missing-gfp_dma-flag-for-atomic-buffer-allocation.patch
+rt2x00-error-in-configurations-with-mesh-support-disabled.patch