Skip to content

Commit

Permalink
ath5k: beacon interval is in TU
Browse files Browse the repository at this point in the history
the beacon interval is passed by mac80211 in TU already, so we can directly use
it without conversion. also update the comments about TU (1 TU is defined by
802.11 as 1024usec).

drivers/net/wireless/ath5k/ath5k.h:     Changes-licensed-under: ISC
drivers/net/wireless/ath5k/base.c:      Changes-licensed-under: 3-Clause-BSD
drivers/net/wireless/ath5k/base.h:      Changes-licensed-under: 3-Clause-BSD

Signed-off-by: Bruno Randolf <bruno@thinktube.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Bruno Randolf authored and David S. Miller committed Jan 28, 2008
1 parent 1008e0f commit e535c1a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/ath5k/ath5k.h
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ struct ath5k_beacon_state {
* TSF to TU conversion:
*
* TSF is a 64bit value in usec (microseconds).
* TU is a 32bit value in roughly msec (milliseconds): usec / 1024
* (1000ms equals 976 TU)
* TU is a 32bit value and defined by IEEE802.11 (page 6) as "A measurement of
* time equal to 1024 usec", so it's roughly milliseconds (usec / 1024).
*/
#define TSF_TO_TU(_tsf) (u32)((_tsf) >> 10)

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/ath5k/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2554,7 +2554,7 @@ ath5k_config(struct ieee80211_hw *hw,
{
struct ath5k_softc *sc = hw->priv;

sc->bintval = conf->beacon_int * 1000 / 1024;
sc->bintval = conf->beacon_int;
ath5k_setcurmode(sc, conf->phymode);

return ath5k_chan_set(sc, conf->chan);
Expand All @@ -2570,7 +2570,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

/* Set to a reasonable value. Note that this will
* be set to mac80211's value at ath5k_config(). */
sc->bintval = 1000 * 1000 / 1024;
sc->bintval = 1000;
mutex_lock(&sc->lock);
if (sc->vif != vif) {
ret = -EIO;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath5k/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct ath5k_softc {
struct ath5k_buf *bbuf; /* beacon buffer */
unsigned int bhalq, /* SW q for outgoing beacons */
bmisscount, /* missed beacon transmits */
bintval, /* beacon interval */
bintval, /* beacon interval in TU */
bsent;

struct timer_list calib_tim; /* calibration timer */
Expand Down

0 comments on commit e535c1a

Please sign in to comment.