svn commit: r301638 - head/sys/contrib/dev/ath/ath_hal/ar9300

[Adrian Chadd]

Author: adrian
Date: Wed Jun  8 16:08:05 2016
New Revision: 301638
URL: https://svnweb.freebsd.org/changeset/base/301638

Log:
  [ath_hal] initialise ah_beaconInterval when the AP/IBSS/TDMA beacon is setup.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h	Wed Jun  8 16:03:04 2016	(r301637)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h	Wed Jun  8 16:08:05 2016	(r301638)
@@ -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))

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Wed Jun  8 16:03:04 2016	(r301637)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c	Wed Jun  8 16:08:05 2016	(r301638)
@@ -774,8 +774,7 @@ ar9300_beacon_set_beacon_timers(struct a
 	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);