From 4e6b16f25ac188b49c58a1d1c6befc7917d8a912 Mon Sep 17 00:00:00 2001 From: Masakazu Mokuno Date: Fri, 30 May 2008 16:52:23 +0900 Subject: [PATCH] --- yaml --- r: 102841 b: refs/heads/master c: ba569b4c68f11906da2996ee252bcff0df61cb90 h: refs/heads/master i: 102839: 6e3cd11a055afeab44e751f432703fa224eab704 v: v3 --- [refs] | 2 +- trunk/include/linux/wireless.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f39dcb80aaf3..45c5fd252c32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3df4e2486a58826f16574ead1818daab0edb59df +refs/heads/master: ba569b4c68f11906da2996ee252bcff0df61cb90 diff --git a/trunk/include/linux/wireless.h b/trunk/include/linux/wireless.h index 0a9b5b41ed67..4a95a0e5eeca 100644 --- a/trunk/include/linux/wireless.h +++ b/trunk/include/linux/wireless.h @@ -611,6 +611,7 @@ #define IW_ENCODE_ALG_WEP 1 #define IW_ENCODE_ALG_TKIP 2 #define IW_ENCODE_ALG_CCMP 3 +#define IW_ENCODE_ALG_PMK 4 /* struct iw_encode_ext ->ext_flags */ #define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 #define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 @@ -630,6 +631,7 @@ #define IW_ENC_CAPA_WPA2 0x00000002 #define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 #define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 +#define IW_ENC_CAPA_4WAY_HANDSHAKE 0x00000010 /* Event capability macros - in (struct iw_range *)->event_capa * Because we have more than 32 possible events, we use an array of