summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch')
-rw-r--r--package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch30
1 files changed, 15 insertions, 15 deletions
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 a75477497..65491e002 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
-@@ -95,13 +95,8 @@ ath5k_add_interface(struct ieee80211_hw
+@@ -83,13 +83,8 @@ ath5k_add_interface(struct ieee80211_hw
goto end;
}
@@ -9,30 +9,30 @@
- * 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
-@@ -1883,7 +1883,7 @@ ath5k_beacon_send(struct ath5k_softc *sc
- sc->bmisscount = 0;
+@@ -1866,7 +1866,7 @@ ath5k_beacon_send(struct ath5k_hw *ah)
+ ah->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) {
+- if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs > 1) ||
++ if ((ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs + ah->num_adhoc_vifs > 1) ||
+ ah->opmode == NL80211_IFTYPE_MESH_POINT) {
u64 tsf = ath5k_hw_get_tsf64(ah);
u32 tsftu = TSF_TO_TU(tsf);
-@@ -1961,7 +1961,7 @@ ath5k_beacon_update_timers(struct ath5k_
+@@ -1951,7 +1951,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 = ah->bintval & AR5K_BEACON_PERIOD;
+- if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs > 1) {
++ if (ah->opmode == NL80211_IFTYPE_AP && ah->num_ap_vifs + ah->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",
+ ATH5K_WARN(ah, "intval %u is too low, min 15\n",