summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-08-03 13:36:14 +0000
committeradrian <adrian@FreeBSD.org>2011-08-03 13:36:14 +0000
commit4c59a0b47be4a2340ee3348d80cde595ea9c43d0 (patch)
tree1f232c220cfaad9bb6aaef7973208cae3bb92094
parentc19f42911878cf5a20e25a68c6204e1972714a53 (diff)
downloadFreeBSD-src-4c59a0b47be4a2340ee3348d80cde595ea9c43d0.zip
FreeBSD-src-4c59a0b47be4a2340ee3348d80cde595ea9c43d0.tar.gz
* Fix a clash in structure naming which occurs with (closed source)
radar detection code. This is just to make porting the atheros radar code easier. * add a missing space. Approved by: re (kib, blanket)
-rw-r--r--sys/dev/ath/ath_hal/ah.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index 711ef4a..58d6348 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -751,14 +751,14 @@ typedef enum {
#define HAL_DFS_EVENT_EXTEARLY 0x0000004
#define HAL_DFS_EVENT_ISDC 0x0000008
-struct dfs_event {
+struct hal_dfs_event {
uint64_t re_full_ts; /* 64-bit full timestamp from interrupt time */
uint32_t re_ts; /* Original 15 bit recv timestamp */
uint8_t re_rssi; /* rssi of radar event */
uint8_t re_dur; /* duration of radar pulse */
uint32_t re_flags; /* Flags (see above) */
};
-typedef struct dfs_event HAL_DFS_EVENT;
+typedef struct hal_dfs_event HAL_DFS_EVENT;
typedef struct
{
@@ -769,7 +769,7 @@ typedef struct
int ah_dma_beacon_response_time;/* in TU's */
int ah_sw_beacon_response_time; /* in TU's */
int ah_additional_swba_backoff; /* in TU's */
-}HAL_OPS_CONFIG;
+} HAL_OPS_CONFIG;
/*
* Hardware Access Layer (HAL) API.
OpenPOWER on IntegriCloud