projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consider virtual dependencies (generated by using PROVIDES:=) when generating the...
[openwrt.git]
/
package
/
madwifi
/
patches
/
330-beaconcal.patch
diff --git
a/package/madwifi/patches/330-beaconcal.patch
b/package/madwifi/patches/330-beaconcal.patch
index
7dc7b93
..
46b8b76
100644
(file)
--- a/
package/madwifi/patches/330-beaconcal.patch
+++ b/
package/madwifi/patches/330-beaconcal.patch
@@
-1,8
+1,6
@@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-06 20:27:16.005587752 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-06 22:06:51.778996341 +0100
-@@ -395,6 +395,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -397,6 +397,7 @@
static int maxvaps = -1;
static int outdoor = -1;
static int xchanmode = -1;
static int maxvaps = -1;
static int outdoor = -1;
static int xchanmode = -1;
@@
-10,7
+8,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
static const char *hal_status_desc[] = {
"No error",
static const char *hal_status_desc[] = {
"No error",
-@@ -42
0,6 +421
,7 @@
+@@ -42
2,6 +423
,7 @@
};
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
};
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
@@
-18,7
+16,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
MODULE_PARM(countrycode, "i");
MODULE_PARM(maxvaps, "i");
MODULE_PARM(outdoor, "i");
MODULE_PARM(countrycode, "i");
MODULE_PARM(maxvaps, "i");
MODULE_PARM(outdoor, "i");
-@@ -43
2,6 +434
,7 @@
+@@ -43
4,6 +436
,7 @@
MODULE_PARM(ratectl, "s");
#else
#include <linux/moduleparam.h>
MODULE_PARM(ratectl, "s");
#else
#include <linux/moduleparam.h>
@@
-26,7
+24,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
module_param(countrycode, int, 0600);
module_param(maxvaps, int, 0600);
module_param(outdoor, int, 0600);
module_param(countrycode, int, 0600);
module_param(maxvaps, int, 0600);
module_param(outdoor, int, 0600);
-@@ -259
4,7 +2597
,8 @@
+@@ -259
8,7 +2601
,8 @@
}
if (!sc->sc_invalid) {
del_timer_sync(&sc->sc_dfs_cac_timer);
}
if (!sc->sc_invalid) {
del_timer_sync(&sc->sc_dfs_cac_timer);
@@
-36,7
+34,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
}
ath_draintxq(sc);
if (!sc->sc_invalid) {
}
ath_draintxq(sc);
if (!sc->sc_invalid) {
-@@ -261
1,6 +2615
,20 @@
+@@ -261
5,6 +2619
,20 @@
return 0;
}
return 0;
}
@@
-57,7
+55,20
@@
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
/*
* Stop the device, grabbing the top-level lock to protect
* against concurrent entry through ath_init (which can happen
-@@ -5141,6 +5159,8 @@
+@@ -2740,6 +2758,12 @@
+ HAL_STATUS status;
+
+ /*
++ * XXX: starting the calibration too early seems to lead to
++ * problems with the beacons.
++ */
++ sc->sc_lastcal = jiffies;
++
++ /*
+ * Convert to a HAL channel description with the flags
+ * constrained to reflect the current operating mode.
+ */
+@@ -5145,6 +5169,8 @@
"Invoking ath_hal_txstart with sc_bhalq: %d\n",
sc->sc_bhalq);
ath_hal_txstart(ah, sc->sc_bhalq);
"Invoking ath_hal_txstart with sc_bhalq: %d\n",
sc->sc_bhalq);
ath_hal_txstart(ah, sc->sc_bhalq);
@@
-66,7
+77,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
}
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
}
-@@ -539
0,6 +541
0,7 @@
+@@ -539
4,6 +542
0,7 @@
ath_hal_beacontimers(ah, &bs);
sc->sc_imask |= HAL_INT_BMISS;
ath_hal_intrset(ah, sc->sc_imask);
ath_hal_beacontimers(ah, &bs);
sc->sc_imask |= HAL_INT_BMISS;
ath_hal_intrset(ah, sc->sc_imask);
@@
-74,7
+85,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
} else {
ath_hal_intrset(ah, 0);
if (reset_tsf)
} else {
ath_hal_intrset(ah, 0);
if (reset_tsf)
-@@ -540
1,8 +542
2,11 @@
+@@ -540
5,8 +543
2,11 @@
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA;
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA;
@@
-87,7
+98,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));
#ifdef ATH_SUPERG_DYNTURBO
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
-@@ -88
64,6 +8888
,9 @@
+@@ -88
70,6 +8900
,9 @@
/* Enter DFS wait period */
mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (sc->sc_dfs_cac_period * HZ));
/* Enter DFS wait period */
mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (sc->sc_dfs_cac_period * HZ));
@@
-97,7
+108,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
}
/*
* re configure beacons when it is a turbo mode switch.
}
/*
* re configure beacons when it is a turbo mode switch.
-@@ -897
3,8 +9000
,11 @@
+@@ -897
9,8 +9012
,11 @@
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done");
@@
-111,7
+122,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
}
static void
}
static void
-@@ -908
1,7 +9111
,8 @@
+@@ -908
7,7 +9123
,8 @@
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
@@
-121,7
+132,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 */
ath_hal_setledstate(ah, leds[nstate]); /* set LED */
netif_stop_queue(dev); /* before we do anything else */
-@@ -93
06,7 +9337
,8 @@
+@@ -93
12,7 +9349
,8 @@
"VAP -> DFSWAIT_PENDING \n");
/* start calibration timer with a really small value
* 1/10 sec */
"VAP -> DFSWAIT_PENDING \n");
/* start calibration timer with a really small value
* 1/10 sec */
@@
-131,7
+142,7
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
/* wake the receiver */
netif_wake_queue(dev);
/* don't do the other usual stuff... */
-@@ -93
49,7 +9381
,7 @@
+@@ -93
55,7 +9393
,7 @@
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */
error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */
@@
-140,10
+151,8
@@
Index: madwifi-trunk-r3314/ath/if_ath.c
/* start periodic recalibration timer */
mod_timer(&sc->sc_cal_ch, jiffies + (ath_calinterval * HZ));
}
/* start periodic recalibration timer */
mod_timer(&sc->sc_cal_ch, jiffies + (ath_calinterval * HZ));
}
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-02-06 20:27:08.969186784 +0100
-+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-06 20:27:24.670081522 +0100
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
@@ -778,6 +778,8 @@
struct ieee80211vap **sc_bslot; /* beacon xmit slots */
int sc_bnext; /* next slot for beacon xmit */
@@ -778,6 +778,8 @@
struct ieee80211vap **sc_bslot; /* beacon xmit slots */
int sc_bnext; /* next slot for beacon xmit */
This page took
0.028351 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff