svn commit: r224633 - head/sys/dev/ath/ath_hal

Adrian Chadd adrian at FreeBSD.org
Wed Aug 3 13:36:14 UTC 2011


Author: adrian
Date: Wed Aug  3 13:36:14 2011
New Revision: 224633
URL: http://svn.freebsd.org/changeset/base/224633

Log:
  * 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)

Modified:
  head/sys/dev/ath/ath_hal/ah.h

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Wed Aug  3 09:55:59 2011	(r224632)
+++ head/sys/dev/ath/ath_hal/ah.h	Wed Aug  3 13:36:14 2011	(r224633)
@@ -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.


More information about the svn-src-head mailing list