From a4c7f1185e488e17db1a097f0862424d74a7b345 Mon Sep 17 00:00:00 2001
From: alc <alc@NetBSD.org>
Date: Thu, 11 Dec 2008 06:04:01 +0000
Subject: [PATCH] Doh! What should have happened happens ...

Restore the check to see if the chip does MIC correctly when
WME is turned on. Btw, define IEEE80211_C_WME_TKIPMIC and fix build :/
---
 sys/dev/ic/ath.c             | 6 ++----
 sys/net80211/ieee80211_var.h | 5 ++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index a515c683c0bc..99a18101df2d 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath.c,v 1.104 2008/12/11 05:45:29 alc Exp $	*/
+/*	$NetBSD: ath.c,v 1.105 2008/12/11 06:04:01 alc Exp $	*/
 
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.104 2008/12/11 05:45:29 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.105 2008/12/11 06:04:01 alc Exp $");
 #endif
 
 /*
@@ -515,7 +515,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 		ic->ic_caps |= IEEE80211_C_CKIP;
 	if (ath_hal_ciphersupported(ah, HAL_CIPHER_TKIP)) {
 		ic->ic_caps |= IEEE80211_C_TKIP;
-#if 0
 		/*
 		 * Check if h/w does the MIC and/or whether the
 		 * separate key cache entries are required to
@@ -530,7 +529,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
 			if (ath_hal_wmetkipmic(ah))
 				ic->ic_caps |= IEEE80211_C_WME_TKIPMIC;
 		}
-#endif
 
 		/*
 		 * If the h/w supports storing tx+rx MIC keys
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index 7c9c5c80bb1b..68280d290d78 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_var.h,v 1.26 2007/03/04 06:03:19 christos Exp $	*/
+/*	$NetBSD: ieee80211_var.h,v 1.27 2008/12/11 06:04:01 alc Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -276,6 +276,9 @@ extern struct ieee80211com_head ieee80211com_head;
 #define	IEEE80211_C_SHPREAMBLE	0x00008000	/* CAPABILITY: short preamble */
 #define	IEEE80211_C_MONITOR	0x00010000	/* CAPABILITY: monitor mode */
 #define	IEEE80211_C_TKIPMIC	0x00020000	/* CAPABILITY: TKIP MIC avail */
+#define IEEE80211_C_WME_TKIPMIC 0x00040000      /* CAPABILITY: TKIP MIC for QoS
+						   frame */
+/* 0x780000 available */
 #define	IEEE80211_C_WPA1	0x00800000	/* CAPABILITY: WPA1 avail */
 #define	IEEE80211_C_WPA2	0x01000000	/* CAPABILITY: WPA2 avail */
 #define	IEEE80211_C_WPA		0x01800000	/* CAPABILITY: WPA1+WPA2 avail*/