mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
fix a rare wds related noderef issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13095 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/ath/if_ath.c
|
||||
+++ b/ath/if_ath.c
|
||||
@@ -161,6 +161,7 @@
|
||||
@@ -161,6 +161,7 @@ static void ath_beacon_send(struct ath_s
|
||||
static void ath_beacon_return(struct ath_softc *, struct ath_buf *);
|
||||
static void ath_beacon_free(struct ath_softc *);
|
||||
static void ath_beacon_config(struct ath_softc *, struct ieee80211vap *);
|
||||
@@ -8,7 +8,7 @@
|
||||
static int ath_desc_alloc(struct ath_softc *);
|
||||
static void ath_desc_free(struct ath_softc *);
|
||||
static void ath_desc_swap(struct ath_desc *);
|
||||
@@ -2793,6 +2794,72 @@
|
||||
@@ -2793,6 +2794,72 @@ ath_set_ack_bitrate(struct ath_softc *sc
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
/*
|
||||
* Reset the hardware w/o losing operational state. This is
|
||||
* basically a more efficient way of doing ath_stop, ath_init,
|
||||
@@ -5292,6 +5359,7 @@
|
||||
@@ -5292,6 +5359,7 @@ ath_beacon_config(struct ath_softc *sc,
|
||||
u_int64_t tsf, hw_tsf;
|
||||
u_int32_t tsftu, hw_tsftu;
|
||||
u_int32_t intval, nexttbtt = 0;
|
||||
@@ -89,7 +89,7 @@
|
||||
int reset_tsf = 0;
|
||||
|
||||
if (vap == NULL)
|
||||
@@ -5299,6 +5367,9 @@
|
||||
@@ -5299,6 +5367,9 @@ ath_beacon_config(struct ath_softc *sc,
|
||||
|
||||
ni = vap->iv_bss;
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
hw_tsf = ath_hal_gettsf64(ah);
|
||||
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
|
||||
hw_tsftu = hw_tsf >> 10;
|
||||
@@ -5488,15 +5559,27 @@
|
||||
@@ -5488,15 +5559,27 @@ ath_beacon_config(struct ath_softc *sc,
|
||||
<= ath_hal_sw_beacon_response_time)
|
||||
nexttbtt += intval;
|
||||
sc->sc_nexttbtt = nexttbtt;
|
||||
@@ -127,7 +127,7 @@
|
||||
/* We print all debug messages here, in order to preserve the
|
||||
* time critical aspect of this function */
|
||||
DPRINTF(sc, ATH_DEBUG_BEACON,
|
||||
@@ -6399,6 +6482,11 @@
|
||||
@@ -6399,6 +6482,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||
DPRINTF(sc, ATH_DEBUG_BEACON,
|
||||
"Updated beacon timers\n");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user