diff --git a/[refs] b/[refs] index cf0be5d61f90..2303e3ae9315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f65b24536996ac493777ef11474c47e1d3f56a0 +refs/heads/master: 6a669e65c5ec393a650362874e13f7d3365a7827 diff --git a/trunk/include/linux/ieee80211.h b/trunk/include/linux/ieee80211.h index a9173d5434d1..23343ab0bb03 100644 --- a/trunk/include/linux/ieee80211.h +++ b/trunk/include/linux/ieee80211.h @@ -1196,6 +1196,10 @@ enum ieee80211_sa_query_action { #define WLAN_CIPHER_SUITE_WEP104 0x000FAC05 #define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06 +/* AKM suite selectors */ +#define WLAN_AKM_SUITE_8021X 0x000FAC01 +#define WLAN_AKM_SUITE_PSK 0x000FAC02 + #define WLAN_MAX_KEY_LEN 32 /**