summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2016-06-08 16:08:05 +0000
committeradrian <adrian@FreeBSD.org>2016-06-08 16:08:05 +0000
commit94cde17e1ab2998db1f99095c181f45f17833568 (patch)
tree7dfdf84c90fcfe3d4671a42792121779f38042cc /sys/contrib
parentff6e6d531a8c7ccc126673b8fc1c5ee0d532ba04 (diff)
downloadFreeBSD-src-94cde17e1ab2998db1f99095c181f45f17833568.zip
FreeBSD-src-94cde17e1ab2998db1f99095c181f45f17833568.tar.gz
[ath_hal] initialise ah_beaconInterval when the AP/IBSS/TDMA beacon is setup.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h2
-rw-r--r--sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
index eccafba..8dfc690 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
@@ -898,6 +898,8 @@ struct ath_hal_9300 {
struct ar9300NfLimits nf_2GHz;
struct ar9300NfLimits nf_5GHz;
struct ar9300NfLimits *nfp;
+
+ uint32_t ah_beaconInterval;
};
#define AH9300(_ah) ((struct ath_hal_9300 *)(_ah))
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
index e914057..0e12a3d 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
@@ -774,8 +774,7 @@ ar9300_beacon_set_beacon_timers(struct ath_hal *ah,
OS_REG_WRITE(ah, AR_NEXT_NDP_TIMER, TU_TO_USEC(bt->bt_nextatim));
bperiod = TU_TO_USEC(bt->bt_intval & HAL_BEACON_PERIOD);
- /* XXX TODO! */
-// ahp->ah_beaconInterval = bt->bt_intval & HAL_BEACON_PERIOD;
+ AH9300(ah)->ah_beaconInterval = bt->bt_intval & HAL_BEACON_PERIOD;
OS_REG_WRITE(ah, AR_BEACON_PERIOD, bperiod);
OS_REG_WRITE(ah, AR_DMA_BEACON_PERIOD, bperiod);
OS_REG_WRITE(ah, AR_SWBA_PERIOD, bperiod);
OpenPOWER on IntegriCloud