make ath9k driver usable

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

4 files changed, 7 insertions, 12 deletions

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 3945707..42a511e 100755
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -23,5 +23,5 @@ config ATH_DEBUG
 	  Right now only ath9k makes use of this.
 
 source "drivers/net/wireless/ath/ath6kl/Kconfig"
-
+source "drivers/net/wireless/ath/ath9k/Kconfig"
 endif
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
index 214def7..c873bef 100755
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
@@ -1,7 +1,4 @@
-NOSTDINC_FLAGS := -I$(srctree)/include/compat/ \
-        -include $(srctree)/include/compat/linux/compat-2.6.h \
-        $(CFLAGS)
-
+obj-$(CONFIG_ATH9K_HW)		+= ath9k/
 obj-$(CONFIG_ATH6KL)		+= ath6kl/
 obj-$(CONFIG_ATH_COMMON)	+= ath.o
 
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 4596c33..ab56ba0 100755
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -71,7 +71,9 @@ struct ath_regulatory {
 	char alpha2[2];
 	u16 country_code;
 	u16 max_power_level;
+	u32 tp_scale;
 	u16 current_rd;
+	u16 current_rd_ext;
 	int16_t power_limit;
 	struct reg_dmn_pair_mapping *regpair;
 };
@@ -138,6 +140,9 @@ struct ath_common {
 	u8 curbssid[ETH_ALEN];
 	u8 bssidmask[ETH_ALEN];
 
+	u8 tx_chainmask;
+	u8 rx_chainmask;
+
 	u32 rx_bufsize;
 
 	u32 keymax;
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index 947ef45..d9218fe 100755
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -59,22 +59,15 @@ EXPORT_SYMBOL(ath_rxbuf_alloc);
 
 void ath_printk(const char *level, const char *fmt, ...)
 {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
 	struct va_format vaf;
-#endif
 	va_list args;
 
 	va_start(args, fmt);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
 	vaf.fmt = fmt;
 	vaf.va = &args;
 
 	printk("%sath: %pV", level, &vaf);
-#else
-	printk("%sath: ", level);
-	vprintk(fmt, args);
-#endif
 
 	va_end(args);
 }