From 7fdff34eee88daa0efd6559493bdb58dd97a0ee9 Mon Sep 17 00:00:00 2001
From: Bruno Randolf <br1@einfach.org>
Date: Wed, 8 Sep 2010 16:04:33 +0900
Subject: [PATCH] --- yaml --- r: 214671 b: refs/heads/master c:
 34a1305137f484ee1806df5a00b9d8ee8d4ef758 h: refs/heads/master i:   214669:
 d6d6a049769c24f715ac0b814d95a692ef916585   214667:
 3bbde1b2141414c2aa483acdc214a23ed5dd25ca   214663:
 f4cfcde66bd80c0f7c9ace640cf379fe880da8df   214655:
 54088f2940d5e768919f4cbb6c1791a679577c9e v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ath/ath.h | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61c62f7ac0b5..21b440c2536a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c376639297d3dd82d40e54c9cdca8da9dfc22f1
+refs/heads/master: 34a1305137f484ee1806df5a00b9d8ee8d4ef758
diff --git a/trunk/drivers/net/wireless/ath/ath.h b/trunk/drivers/net/wireless/ath/ath.h
index a706202fa67c..057fdd7ddaf4 100644
--- a/trunk/drivers/net/wireless/ath/ath.h
+++ b/trunk/drivers/net/wireless/ath/ath.h
@@ -71,6 +71,15 @@ struct ath_regulatory {
 	struct reg_dmn_pair_mapping *regpair;
 };
 
+enum ath_crypt_caps {
+	ATH_CRYPT_CAP_MIC_AESCCM		= BIT(0),
+	ATH_CRYPT_CAP_MIC_CKIP			= BIT(1),
+	ATH_CRYPT_CAP_MIC_TKIP			= BIT(2),
+	ATH_CRYPT_CAP_CIPHER_AESCCM		= BIT(3),
+	ATH_CRYPT_CAP_CIPHER_CKIP		= BIT(4),
+	ATH_CRYPT_CAP_CIPHER_TKIP		= BIT(5),
+};
+
 /**
  * struct ath_ops - Register read/write operations
  *
@@ -121,6 +130,7 @@ struct ath_common {
 	DECLARE_BITMAP(keymap, ATH_KEYMAX);
 	DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);
 	u8 splitmic;
+	enum ath_crypt_caps crypt_caps;
 
 	struct ath_regulatory regulatory;
 	const struct ath_ops *ops;