misc/128585: [patch] ath_hal-20081028 build failure on amd64

[Tom Canich]

>Number:         128585
>Category:       misc
>Synopsis:       [patch] ath_hal-20081028 build failure on amd64
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 04 19:00:09 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Tom Canich
>Release:        7.0-RELEASE-p4
>Organization:
Pennsylvania State University
>Environment:
FreeBSD orion 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #11: Wed Oct  1 17:15:23 EDT 2008     root at orion:/usr/obj/usr/src/sys/ORION  amd64
>Description:
Inclusion of ath_hal of 10-28-2008 from http://people.freebsd.org/~sam/ath_hal-20081028.tgz results in a failed "make buildkernel":

/usr/src$ sudo make buildkernel
[...]
cc -c -O2 -frename-registers -pipe -fno-strict-aliasing  -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc  -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -Werror  /usr/src/sys/dev/ath/if_ath.c -I/usr/src/sys/dev/ath
/usr/src/sys/dev/ath/if_ath.c: In function 'ath_dfswait':
/usr/src/sys/dev/ath/if_ath.c:4988: error: 'struct ath_hal' has no member named 'ah_radarWait'
*** Error code 1

Stop in /usr/obj/usr/src/sys/GENERIC.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.


make.conf:
# added by use.perl 2008-02-12 15:38:07
PERL_VER=5.8.8
PERL_VERSION=5.8.8

DWM_CONF=/home/tcanich/config/dwm-config.h
DVTM_CONF=/home/tcanich/config/dvtm-config.h

NO_SENDMAIL=true

>How-To-Repeat:
Remove /usr/src/sys/contrib/dev/ath
Unpack the ath_hal-20081028.tgz archive to /usr/src/sys/contrib/dev/ath
make buildkernel in /usr/src
>Fix:
Modify /usr/src/sys/contrib/dev/ath/ah.h ($Id: ah.h,v 1.10 2008/10/28 21:16:37 sam Exp $) adding line from ath_hal-20080528's ah.h ( $Id: //depot/sw/branches/sam_hal/ah.h#30 $):

/* DFS support */
HAL_BOOL  __ahdecl(*ah_radarWait)(struct ath_hal *, HAL_CHANNEL *);

within struct ath_hal

cd /usr/src; make buildkernel

Patch attached with submission follows:

--- ah.h.orig	2008-11-04 10:34:24.000000000 -0500
+++ ah.h	2008-11-04 10:02:20.000000000 -0500
@@ -704,6 +704,9 @@
 				u_int rtsctsRate, u_int rtsctsDuration,
 				u_int compicvLen, u_int compivLen,
 				u_int comp);
+	/* DFS support */
+	HAL_BOOL  __ahdecl(*ah_radarWait)(struct ath_hal *, HAL_CHANNEL *);
+
 	HAL_BOOL  __ahdecl(*ah_setupXTxDesc)(struct ath_hal *, struct ath_desc*,
 				u_int txRate1, u_int txTries1,
 				u_int txRate2, u_int txTries2,


>Release-Note:
>Audit-Trail:
>Unformatted: