mac80211: update to wireless-testing 2013-04-16 + backports

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 410-ath9k_allow_adhoc_and_ap.patch

diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
index b03a0661c898815c6594bfec41e48f217f3d2ca6..35363e7b01beb40f39f63555269cb702088f6d0e 100644 (file)
--- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -1,17 +1,10 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1483,14 +1483,6 @@ static int ath9k_add_interface(struct ie
-               }
-       }
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -731,6 +731,7 @@ static const struct ieee80211_iface_limi
+ #endif
+                                BIT(NL80211_IFTYPE_AP) |
+                                BIT(NL80211_IFTYPE_P2P_GO) },
++      { .max = 1,     .types = BIT(NL80211_IFTYPE_ADHOC) },
+ };
  
--      if ((vif->type == NL80211_IFTYPE_ADHOC) &&
--          sc->nvifs > 0) {
--              ath_err(common, "Cannot create ADHOC interface when other"
--                      " interfaces already exist.\n");
--              ret = -EINVAL;
--              goto out;
--      }
--
-       ath_dbg(common, ATH_DBG_CONFIG,
-               "Attach a VIF of type: %d\n", vif->type);