aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/300-pending_work.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-02-26 15:14:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-02-26 15:14:32 +0000
commit325cb65009b894184c8f45dc7a126e5b22ddf5e3 (patch)
treefa2adfab862839dc376c67f29cf3576d11008fd9 /package/mac80211/patches/300-pending_work.patch
parenta85019072fea12ce396fa740ad8fd0db061669a2 (diff)
downloadupstream-325cb65009b894184c8f45dc7a126e5b22ddf5e3.tar.gz
upstream-325cb65009b894184c8f45dc7a126e5b22ddf5e3.tar.bz2
upstream-325cb65009b894184c8f45dc7a126e5b22ddf5e3.zip
rt2x00: prevent device probe errors with CONFIG_MAC80211_MESH disabled (#13080)
SVN-Revision: 35806
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
-rw-r--r--package/mac80211/patches/300-pending_work.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 51da3cf84d..1bc32a0671 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -512,3 +512,28 @@
if (!ath9k_hw_set_reset_reg(ah, reset_type))
return false;
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_comb
+ */
+ if_limit = &rt2x00dev->if_limits_ap;
+ if_limit->max = rt2x00dev->ops->max_ap_intf;
+- if_limit->types = BIT(NL80211_IFTYPE_AP) |
+- BIT(NL80211_IFTYPE_MESH_POINT);
++ if_limit->types = BIT(NL80211_IFTYPE_AP);
++#ifdef CONFIG_MAC80211_MESH
++ if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
++#endif
+
+ /*
+ * Build up AP interface combinations structure.
+@@ -1309,7 +1311,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;