ath - Fix a mismatch in the module options.

This caused a panic with ifconfig in basic operations such
as putting an interface up.

Submitted-by: <rpaulo@FreeBSD.org>

diff --git a/sys/dev/netif/ath/Makefile.inc b/sys/dev/netif/ath/Makefile.inc
index 2f0a8de..133be9f 100644 (file)
--- a/sys/dev/netif/ath/Makefile.inc
+++ b/sys/dev/netif/ath/Makefile.inc
@@ -3,3 +3,15 @@
 HAL    = ${.CURDIR}/../hal/ath_hal
 HALOSDEP= ${.CURDIR}/../hal
 CFLAGS += -I${HALOSDEP}
+
+opt_inet.h:
+       echo "#define INET      1" > ${.TARGET}
+       echo "#define INET6     1" >> ${.TARGET}
+
+opt_wlan.h:
+       echo "#define IEEE80211_DEBUG           1" > ${.TARGET}
+       echo "#define IEEE80211_SUPPORT_TDMA    1" >> ${.TARGET}
+       echo "#define IEEE80211_SUPPORT_MESH    1" >> ${.TARGET}
+
+opt_ah.h:
+       echo "#define AH_SUPPORT_AR5416         1" > ${.TARGET}

diff --git a/sys/dev/netif/ath/ath/Makefile b/sys/dev/netif/ath/ath/Makefile
index 7f7ad52..f7b277c 100644 (file)
--- a/sys/dev/netif/ath/ath/Makefile
+++ b/sys/dev/netif/ath/ath/Makefile
@@ -41,12 +41,4 @@ KMOD = if_ath
 SRCS   = if_ath.c if_ath_pci.c
 SRCS   += device_if.h bus_if.h pci_if.h opt_ath.h opt_ah.h opt_wlan.h opt_inet.h
 
-opt_inet.h:
-       echo "#define INET6     1" > ${.TARGET}
-
-opt_wlan.h:
-       echo "#define IEEE80211_DEBUG           1" > ${.TARGET}
-       echo "#define IEEE80211_SUPPORT_TDMA    1" >> ${.TARGET}
-       echo "#define IEEE80211_SUPPORT_MESH    1" >> ${.TARGET}
-
 .include <bsd.kmod.mk>

diff --git a/sys/dev/netif/ath/hal/Makefile b/sys/dev/netif/ath/hal/Makefile
index 6f612bb..05c7d39 100644 (file)
--- a/sys/dev/netif/ath/hal/Makefile
+++ b/sys/dev/netif/ath/hal/Makefile
@@ -113,11 +113,6 @@ SRCS+=     ar9285.c
 #SRCS+=        amrr.c
 #.endif
 
-CFLAGS+=  -I. -I${HAL} -DAH_SUPPORT_AR5416
-
-.if !defined(BUILDING_WITH_KERNEL)
-opt_ah.h:
-       echo '#define AH_SUPPORT_AR5416 1' > opt_ah.h
-.endif
+CFLAGS+=  -I. -I${HAL}
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/netif/ath/rate_sample/Makefile b/sys/dev/netif/ath/rate_sample/Makefile
index 5a63595..c30e658 100644 (file)
--- a/sys/dev/netif/ath/rate_sample/Makefile
+++ b/sys/dev/netif/ath/rate_sample/Makefile
@@ -41,12 +41,4 @@ KMOD = ath_rate
 SRCS   = sample.c
 SRCS   += device_if.h bus_if.h pci_if.h opt_ah.h opt_wlan.h opt_inet.h
 
-opt_inet.h:
-       echo "#define INET6     1" > ${.TARGET}
-
-opt_wlan.h:
-       echo "#define IEEE80211_DEBUG           1" > ${.TARGET}
-       echo "#define IEEE80211_SUPPORT_TDMA    1" >> ${.TARGET}
-       echo "#define IEEE80211_SUPPORT_MESH    1" >> ${.TARGET}
-
 .include <bsd.kmod.mk>