From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 15 Apr 2011 16:55:24 +0000 (+0000)
Subject: ath5k: allow simultaneous ad-hoc+ap operation (backport of r26685)
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=7c662b7493b4c93c5bc396c63f65fc4ccb6a50fb

ath5k: allow simultaneous ad-hoc+ap operation (backport of r26685)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26686 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
new file mode 100644
index 000000000..b1d835f86
--- /dev/null
+++ b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
@@ -0,0 +1,38 @@
+--- 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 
+ 		goto end;
+ 	}
+ 
+-	/* Don't allow other interfaces if one ad-hoc is configured.
+-	 * TODO: Fix the problems with ad-hoc and multiple other interfaces.
+-	 * 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)) {
++	/* 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");
+ 		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;
+ 	}
+ 
+-	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) {
+ 		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;
+ 
+ 	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 /= ATH_BCBUF;	/* staggered multi-bss beacons */
+ 		if (intval < 15)
+ 			ATH5K_WARN(sc, "intval %u is too low, min 15\n",
diff --git a/package/mac80211/patches/463-ath5k_fix_slottime.patch b/package/mac80211/patches/463-ath5k_fix_slottime.patch
index 01e55d35d..3f38ee392 100644
--- a/package/mac80211/patches/463-ath5k_fix_slottime.patch
+++ b/package/mac80211/patches/463-ath5k_fix_slottime.patch
@@ -10,7 +10,7 @@
  	u32			ah_ant_ctl[AR5K_EEPROM_N_MODES][AR5K_ANT_MAX];
 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
 +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -282,6 +282,15 @@ ath5k_bss_info_changed(struct ieee80211_
+@@ -277,6 +277,15 @@ ath5k_bss_info_changed(struct ieee80211_
  	if (changes & BSS_CHANGED_BEACON_INT)
  		sc->bintval = bss_conf->beacon_int;
  
diff --git a/package/mac80211/patches/472-ath_unshare_bus_ops.patch b/package/mac80211/patches/472-ath_unshare_bus_ops.patch
index b3b0eab1f..3b0ffb972 100644
--- a/package/mac80211/patches/472-ath_unshare_bus_ops.patch
+++ b/package/mac80211/patches/472-ath_unshare_bus_ops.patch
@@ -18,7 +18,7 @@
  	void *ah;
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -847,6 +847,14 @@ struct ath_hw {
+@@ -846,6 +846,14 @@ struct ath_hw {
  	u32 ent_mode;
  };