ath9k/ath5k: fix driver load issues with mesh support compiled out

[openwrt/openwrt.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 13f11bba9295c40135d096f550dd1043337e2002..d23edd3b842bb9cd97fb6298cf503ab759247141 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,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1491,15 +1491,6 @@ static int ath9k_add_interface(struct ie
+@@ -1445,15 +1445,6 @@ static int ath9k_add_interface(struct ie
                }
        }
  
@@ -13,10 +13,10 @@
 -              goto out;
 -      }
 -
-       ath_dbg(common, ATH_DBG_CONFIG,
-               "Attach a VIF of type: %d\n", vif->type);
+       ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);
  
-@@ -1525,15 +1516,6 @@ static int ath9k_change_interface(struct
+       sc->nvifs++;
+@@ -1478,15 +1469,6 @@ static int ath9k_change_interface(struct
        mutex_lock(&sc->mutex);
        ath9k_ps_wakeup(sc);
  
@@ -32,3 +32,13 @@
        if (ath9k_uses_beacons(new_type) &&
            !ath9k_uses_beacons(vif->type)) {
                if (sc->nbcnvifs >= ATH_BCBUF) {
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -655,6 +655,7 @@ static const struct ieee80211_iface_limi
+ #ifdef CONFIG_MAC80211_MESH
+                                BIT(NL80211_IFTYPE_MESH_POINT) |
+ #endif
++                               BIT(NL80211_IFTYPE_ADHOC) |
+                                BIT(NL80211_IFTYPE_AP) |
+                                BIT(NL80211_IFTYPE_P2P_GO) },
+ };