X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fmac80211%2Fpatches%2F410-ath9k_allow_adhoc_and_ap.patch;h=7a07eb6e97d54711fa0cd8b67c35c78539794170;hb=69f14643553523e5d7b2e90a742978ea9ab2f0dd;hp=6a39995703b93d8b6e744953c4ffdecf414ab989;hpb=e8923f5d9e78fa4a95826f0f0097dc62a9313feb;p=openwrt.git

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 6a39995703..7a07eb6e97 100644
--- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
+++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
@@ -1,34 +1,10 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1430,15 +1430,6 @@ static int ath9k_add_interface(struct ie
- 		}
- 	}
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -727,6 +727,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 ((ah->opmode == NL80211_IFTYPE_ADHOC) ||
--	    ((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, CONFIG, "Attach a VIF of type: %d\n", vif->type);
- 
- 	sc->nvifs++;
-@@ -1463,15 +1454,6 @@ static int ath9k_change_interface(struct
- 	mutex_lock(&sc->mutex);
- 	ath9k_ps_wakeup(sc);
- 
--	/* See if new interface type is valid. */
--	if ((new_type == NL80211_IFTYPE_ADHOC) &&
--	    (sc->nvifs > 1)) {
--		ath_err(common, "When using ADHOC, it must be the only"
--			" interface.\n");
--		ret = -EINVAL;
--		goto out;
--	}
--
- 	if (ath9k_uses_beacons(new_type) &&
- 	    !ath9k_uses_beacons(vif->type)) {
- 		if (sc->nbcnvifs >= ATH_BCBUF) {
+ static const struct ieee80211_iface_combination if_comb = {