Patchwork [3.5.y.z,extended,stable] Patch "rt2x00: error in configurations with mesh support disabled" has been added to staging queue

mail settings
Submitter Luis Henriques
Date March 21, 2013, 12:51 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/229661/
State New
Headers show


Luis Henriques - March 21, 2013, 12:51 p.m.
This is a note to let you know that I have just added a patch titled

    rt2x00: error in configurations with mesh support disabled

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see



From 8b629a99898857715ab1be62917374ce3418a90b Mon Sep 17 00:00:00 2001
From: Lingzhu Xiang <>
Date: Tue, 19 Mar 2013 13:06:46 +0800
Subject: [PATCH] rt2x00: error in configurations with mesh support disabled

commit 6ef9e2f6d12ce9e2120916804d2ddd46b954a70b upstream.

Backported for 3.4-stable. Removed code of simultaneous AP and mesh
mode added in 4a5fc6d 3.9-rc1.

From: Felix Fietkau <>

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.

Signed-off-by: Felix Fietkau <>
Acked-by: Gertjan van Wingerde <>
Signed-off-by: John W. Linville <>
Signed-off-by: Lingzhu Xiang <>
Reviewed-by: CAI Qian <>
Signed-off-by: Luis Henriques <>
 drivers/net/wireless/rt2x00/rt2x00dev.c | 2 ++
 1 file changed, 2 insertions(+)



diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 0cf05c3..499c68f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1157,7 +1157,9 @@  int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 		rt2x00dev->hw->wiphy->interface_modes |=
 		    BIT(NL80211_IFTYPE_ADHOC) |
 		    BIT(NL80211_IFTYPE_AP) |
+#ifdef CONFIG_MAC80211_MESH