summaryrefslogtreecommitdiff
path: root/package/madwifi/patches/330-beaconcal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/madwifi/patches/330-beaconcal.patch')
-rw-r--r--package/madwifi/patches/330-beaconcal.patch36
1 files changed, 18 insertions, 18 deletions
diff --git a/package/madwifi/patches/330-beaconcal.patch b/package/madwifi/patches/330-beaconcal.patch
index fe4f972..a1c299d 100644
--- a/package/madwifi/patches/330-beaconcal.patch
+++ b/package/madwifi/patches/330-beaconcal.patch
@@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c
===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:59:04.037808900 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:59:07.426001981 +0100
-@@ -395,6 +395,7 @@
+--- madwifi-trunk-r3314.orig/ath/if_ath.c
++++ madwifi-trunk-r3314/ath/if_ath.c
+@@ -397,6 +397,7 @@
static int maxvaps = -1;
static int outdoor = -1;
static int xchanmode = -1;
@@ -10,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
static const char *hal_status_desc[] = {
"No error",
-@@ -420,6 +421,7 @@
+@@ -422,6 +423,7 @@
};
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
@@ -18,7 +18,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
MODULE_PARM(countrycode, "i");
MODULE_PARM(maxvaps, "i");
MODULE_PARM(outdoor, "i");
-@@ -432,6 +434,7 @@
+@@ -434,6 +436,7 @@
MODULE_PARM(ratectl, "s");
#else
#include <linux/moduleparam.h>
@@ -26,7 +26,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
module_param(countrycode, int, 0600);
module_param(maxvaps, int, 0600);
module_param(outdoor, int, 0600);
-@@ -2595,7 +2598,8 @@
+@@ -2598,7 +2601,8 @@
}
if (!sc->sc_invalid) {
del_timer_sync(&sc->sc_dfs_cac_timer);
@@ -36,7 +36,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
}
ath_draintxq(sc);
if (!sc->sc_invalid) {
-@@ -2612,6 +2616,20 @@
+@@ -2615,6 +2619,20 @@
return 0;
}
@@ -57,7 +57,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/*
* Stop the device, grabbing the top-level lock to protect
* against concurrent entry through ath_init (which can happen
-@@ -2737,6 +2755,12 @@
+@@ -2740,6 +2758,12 @@
HAL_STATUS status;
/*
@@ -70,7 +70,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
* Convert to a HAL channel description with the flags
* constrained to reflect the current operating mode.
*/
-@@ -5142,6 +5166,8 @@
+@@ -5145,6 +5169,8 @@
"Invoking ath_hal_txstart with sc_bhalq: %d\n",
sc->sc_bhalq);
ath_hal_txstart(ah, sc->sc_bhalq);
@@ -79,7 +79,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
}
-@@ -5391,6 +5417,7 @@
+@@ -5394,6 +5420,7 @@
ath_hal_beacontimers(ah, &bs);
sc->sc_imask |= HAL_INT_BMISS;
ath_hal_intrset(ah, sc->sc_imask);
@@ -87,7 +87,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} else {
ath_hal_intrset(ah, 0);
if (reset_tsf)
-@@ -5402,8 +5429,11 @@
+@@ -5405,8 +5432,11 @@
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA;
@@ -100,7 +100,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
#ifdef ATH_SUPERG_DYNTURBO
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
-@@ -8864,6 +8894,9 @@
+@@ -8870,6 +8900,9 @@
/* Enter DFS wait period */
mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (sc->sc_dfs_cac_period * HZ));
@@ -110,7 +110,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
}
/*
* re configure beacons when it is a turbo mode switch.
-@@ -8973,8 +9006,11 @@
+@@ -8979,8 +9012,11 @@
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
@@ -124,7 +124,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
}
static void
-@@ -9081,7 +9117,8 @@
+@@ -9087,7 +9123,8 @@
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
@@ -134,7 +134,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ath_hal_setledstate(ah, leds[nstate]); /* set LED */
netif_stop_queue(dev); /* before we do anything else */
-@@ -9306,7 +9343,8 @@
+@@ -9312,7 +9349,8 @@
"VAP -> DFSWAIT_PENDING \n");
/* start calibration timer with a really small value
* 1/10 sec */
@@ -144,7 +144,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
-@@ -9349,7 +9387,7 @@
+@@ -9355,7 +9393,7 @@
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */
@@ -155,8 +155,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
}
Index: madwifi-trunk-r3314/ath/if_athvar.h
===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-02-20 21:58:38.148333545 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 21:59:07.426001981 +0100
+--- madwifi-trunk-r3314.orig/ath/if_athvar.h
++++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -778,6 +778,8 @@
struct ieee80211vap **sc_bslot; /* beacon xmit slots */
int sc_bnext; /* next slot for beacon xmit */