projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm47xx: update bcma and ssb to master-2011-07-21
[openwrt.git]
/
package
/
madwifi
/
patches
/
424-timing.patch
diff --git
a/package/madwifi/patches/424-timing.patch
b/package/madwifi/patches/424-timing.patch
index
b4c00bd
..
8369db6
100644
(file)
--- a/
package/madwifi/patches/424-timing.patch
+++ b/
package/madwifi/patches/424-timing.patch
@@
-16,7
+16,7
@@
return 0;
bad3:
return 0;
bad3:
-@@ -267
2,6 +2674
,7 @@ ath_init(struct net_device *dev)
+@@ -267
3,6 +2675
,7 @@ ath_init(struct net_device *dev)
*/
ath_chan_change(sc, ic->ic_curchan);
ath_set_ack_bitrate(sc, sc->sc_ackrate);
*/
ath_chan_change(sc, ic->ic_curchan);
ath_set_ack_bitrate(sc, sc->sc_ackrate);
@@
-24,7
+24,7
@@
dev->flags |= IFF_RUNNING; /* we are ready to go */
ieee80211_start_running(ic); /* start all VAPs */
#ifdef ATH_TX99_DIAG
dev->flags |= IFF_RUNNING; /* we are ready to go */
ieee80211_start_running(ic); /* start all VAPs */
#ifdef ATH_TX99_DIAG
-@@ -448
3,17 +4486
,52 @@ ath_mode_init(struct net_device *dev)
+@@ -448
4,17 +4487
,52 @@ ath_mode_init(struct net_device *dev)
* Set the slot time based on the current setting.
*/
static void
* Set the slot time based on the current setting.
*/
static void
@@
-82,7
+82,7
@@
sc->sc_updateslot = OK;
}
sc->sc_updateslot = OK;
}
-@@ -451
5,7 +4553
,7 @@ ath_updateslot(struct net_device *dev)
+@@ -451
6,7 +4554
,7 @@ ath_updateslot(struct net_device *dev)
if (ic->ic_opmode == IEEE80211_M_HOSTAP)
sc->sc_updateslot = UPDATE;
else if (dev->flags & IFF_RUNNING)
if (ic->ic_opmode == IEEE80211_M_HOSTAP)
sc->sc_updateslot = UPDATE;
else if (dev->flags & IFF_RUNNING)
@@
-91,7
+91,7
@@
}
#ifdef ATH_SUPERG_DYNTURBO
}
#ifdef ATH_SUPERG_DYNTURBO
-@@ -53
59,7 +5397
,7 @@ ath_beacon_send(struct ath_softc *sc, in
+@@ -53
60,7 +5398
,7 @@ ath_beacon_send(struct ath_softc *sc, in
sc->sc_updateslot = COMMIT; /* commit next beacon */
sc->sc_slotupdate = slot;
} else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
sc->sc_updateslot = COMMIT; /* commit next beacon */
sc->sc_slotupdate = slot;
} else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
@@
-100,7
+100,7
@@
if (bfaddr != 0) {
/*
if (bfaddr != 0) {
/*
-@@ -94
29,7 +9467
,8 @@ ath_set_coverageclass(struct ieee80211co
+@@ -94
33,7 +9471
,8 @@ ath_set_coverageclass(struct ieee80211co
{
struct ath_softc *sc = ic->ic_dev->priv;
{
struct ath_softc *sc = ic->ic_dev->priv;
@@
-110,7
+110,7
@@
return;
}
return;
}
-@@ -1095
0,6 +10989
,7 @@ enum {
+@@ -1095
6,6 +10995
,7 @@ enum {
ATH_OFDM_WEAK_DET = 29,
ATH_CHANBW = 30,
ATH_OUTDOOR = 31,
ATH_OFDM_WEAK_DET = 29,
ATH_CHANBW = 30,
ATH_OUTDOOR = 31,
@@
-118,7
+118,7
@@
};
/*
};
/*
-@@ -1116
2,21 +11202
,31 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -1116
8,21 +11208
,31 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
sc->sc_slottimeconf = val;
else
sc->sc_slottimeconf = 0;
sc->sc_slottimeconf = val;
else
sc->sc_slottimeconf = 0;
@@
-153,7
+153,7
@@
break;
case ATH_SOFTLED:
if (val != sc->sc_softled) {
break;
case ATH_SOFTLED:
if (val != sc->sc_softled) {
-@@ -1133
2,6 +11382
,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
+@@ -1133
8,6 +11388
,9 @@ ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl
case ATH_CHANBW:
val = sc->sc_chanbw ?: 20;
break;
case ATH_CHANBW:
val = sc->sc_chanbw ?: 20;
break;
@@
-163,7
+163,7
@@
case ATH_SLOTTIME:
val = ath_hal_getslottime(ah);
break;
case ATH_SLOTTIME:
val = ath_hal_getslottime(ah);
break;
-@@ -1145
3,6 +11506
,12 @@ static const ctl_table ath_sysctl_templa
+@@ -1145
9,6 +11512
,12 @@ static const ctl_table ath_sysctl_templa
.extra2 = (void *)ATH_CTSTIMEOUT,
},
{ .ctl_name = CTL_AUTO,
.extra2 = (void *)ATH_CTSTIMEOUT,
},
{ .ctl_name = CTL_AUTO,
@@
-196,10
+196,12
@@
static inline void ath_hal_beaconinit(struct ath_hal *ah, u_int32_t nexttbtt,
u_int32_t intval)
{
static inline void ath_hal_beaconinit(struct ath_hal *ah, u_int32_t nexttbtt,
u_int32_t intval)
{
-@@ -841,6 +852,17 @@ static inline HAL_BOOL ath_hal_setslotti
+@@ -839,6 +850,17 @@ static inline HAL_BOOL ath_hal_setslotti
+ ath_hal_set_function(NULL);
+ ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
return ret;
return ret;
-
}
-
+
+
}
++
+static inline HAL_BOOL ath_hal_seteifstime(struct ath_hal *ah, u_int a1)
+{
+ HAL_BOOL ret;
+static inline HAL_BOOL ath_hal_seteifstime(struct ath_hal *ah, u_int a1)
+{
+ HAL_BOOL ret;
@@
-209,11
+211,9
@@
+ ath_hal_set_function(NULL);
+ ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
+ return ret;
+ ath_hal_set_function(NULL);
+ ATH_HAL_UNLOCK_IRQ(ah->ah_sc);
+ return ret;
-
+
}
-+
+
}
+
static inline void ath_hal_setledstate(struct ath_hal *ah, HAL_LED_STATE a1)
static inline void ath_hal_setledstate(struct ath_hal *ah, HAL_LED_STATE a1)
- {
- ATH_HAL_LOCK_IRQ(ah->ah_sc);
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -613,6 +613,15 @@ struct ath_rp {
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -613,6 +613,15 @@ struct ath_rp {
@@
-232,7
+232,7
@@
struct ath_softc {
struct ieee80211com sc_ic; /* NB: must be first */
struct net_device *sc_dev;
struct ath_softc {
struct ieee80211com sc_ic; /* NB: must be first */
struct net_device *sc_dev;
-@@ -83
8,6 +847
,8 @@ struct ath_softc {
+@@ -83
9,6 +848
,8 @@ struct ath_softc {
* detected radars */
u_int32_t sc_nexttbtt;
u_int64_t sc_last_tsf;
* detected radars */
u_int32_t sc_nexttbtt;
u_int64_t sc_last_tsf;
@@
-241,7
+241,7
@@
};
typedef void (*ath_callback) (struct ath_softc *);
};
typedef void (*ath_callback) (struct ath_softc *);
-@@ -94
5,49 +956
,76 @@ int ar_device(int devid);
+@@ -94
6,49 +957
,76 @@ int ar_device(int devid);
DEV_NAME(_v->iv_ic->ic_dev))
void ath_radar_detected(struct ath_softc *sc, const char* message);
DEV_NAME(_v->iv_ic->ic_dev))
void ath_radar_detected(struct ath_softc *sc, const char* message);
@@
-446,7
+446,7
@@
{
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
{
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
-@@ -137,92 +137,6 @@ rate_to_ndx(struct sample_node *sn, int
+@@ -137,92 +137,6 @@ rate_to_ndx(struct sample_node *sn, int
return -1;
}
return -1;
}
@@
-541,7
+541,7
@@
ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
-@@ -27
36,6 +2736
,7 @@ ieee80211_ioctl_setparam(struct net_devi
+@@ -27
45,6 +2745
,7 @@ ieee80211_ioctl_setparam(struct net_devi
case IEEE80211_PARAM_COVERAGE_CLASS:
if (value <= IEEE80211_COVERAGE_CLASS_MAX) {
ic->ic_coverageclass = value;
case IEEE80211_PARAM_COVERAGE_CLASS:
if (value <= IEEE80211_COVERAGE_CLASS_MAX) {
ic->ic_coverageclass = value;
@@
-568,7
+568,7
@@
-ALLPROGS= athstats 80211stats athkey athchans athctrl \
+ALLPROGS= athstats 80211stats athkey athchans \
-ALLPROGS= athstats 80211stats athkey athchans athctrl \
+ALLPROGS= athstats 80211stats athkey athchans \
-
athdebug 80211debug
wlanconfig ath_info
+
$(if $(DEBUG),athdebug 80211debug)
wlanconfig ath_info
OBJS= $(patsubst %,%.o,$(ALLPROGS))
--- a/tools/athctrl.c
OBJS= $(patsubst %,%.o,$(ALLPROGS))
--- a/tools/athctrl.c
This page took
0.03308 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff