X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F411-ath5k_allow_adhoc_and_ap.patch;h=8e02950e4a71c8e64efde97dc8ae2e4c59669b98;hp=b1d835f867dce7f346e928bbf6361d2298493d81;hb=de017af48d93a4c8bd0691f5cb9315e2f5f15cf1;hpb=84a5abf7df7647042004d307d97cd8bfdc968f60

diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
index b1d835f867..8e02950e4a 100644
--- a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
+++ b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -97,13 +97,8 @@ ath5k_add_interface(struct ieee80211_hw 
+@@ -89,13 +89,8 @@ ath5k_add_interface(struct ieee80211_hw 
  		goto end;
  	}
  
@@ -9,30 +9,38 @@
 -	 * We would need to operate the HW in ad-hoc mode to allow TSF updates
 -	 * for the IBSS, but this breaks with additional AP or STA interfaces
 -	 * at the moment. */
--	if (sc->num_adhoc_vifs ||
--	    (sc->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) {
+-	if (ah->num_adhoc_vifs ||
+-	    (ah->nvifs && vif->type == NL80211_IFTYPE_ADHOC)) {
 +	/* Don't allow more than one ad-hoc interface */
-+	if (sc->num_adhoc_vifs && vif->type == NL80211_IFTYPE_ADHOC) {
- 		ATH5K_ERR(sc, "Only one single ad-hoc interface is allowed.\n");
++	if (ah->num_adhoc_vifs && vif->type == NL80211_IFTYPE_ADHOC) {
+ 		ATH5K_ERR(ah, "Only one single ad-hoc interface is allowed.\n");
  		ret = -ELNRNG;
  		goto end;
 --- a/drivers/net/wireless/ath/ath5k/base.c
 +++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -1857,7 +1857,7 @@ ath5k_beacon_send(struct ath5k_softc *sc
- 		sc->bmisscount = 0;
+@@ -1878,7 +1878,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
  	}
  
--	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||
-+	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs + sc->num_adhoc_vifs > 1) ||
- 			sc->opmode == NL80211_IFTYPE_MESH_POINT) {
+ 	if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs +
+-			ah->num_mesh_vifs > 1) ||
++			ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) ||
+ 			ah->opmode == NL80211_IFTYPE_MESH_POINT) {
  		u64 tsf = ath5k_hw_get_tsf64(ah);
  		u32 tsftu = TSF_TO_TU(tsf);
-@@ -1935,7 +1935,7 @@ ath5k_beacon_update_timers(struct ath5k_
- 	u64 hw_tsf;
+@@ -1964,7 +1964,7 @@ ath5k_beacon_update_timers(struct ath5k_
  
- 	intval = sc->bintval & AR5K_BEACON_PERIOD;
--	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {
-+	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs + sc->num_adhoc_vifs > 1) {
+ 	intval = ah->bintval & AR5K_BEACON_PERIOD;
+ 	if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs
+-		+ ah->num_mesh_vifs > 1) {
++		+ ah->num_adhoc_vifs + ah->num_mesh_vifs > 1) {
  		intval /= ATH_BCBUF;	/* staggered multi-bss beacons */
  		if (intval < 15)
- 			ATH5K_WARN(sc, "intval %u is too low, min 15\n",
+ 			ATH5K_WARN(ah, "intval %u is too low, min 15\n",
+@@ -2427,6 +2427,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) },
+ };
+