diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-30 14:22:19 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-30 14:22:19 -0500 |
| commit | 20fb9e50338199d9e88512703af4c560ab53bad4 (patch) | |
| tree | 2d0913749141e9e8e0df774426a658b52fddabbf /include/linux | |
| parent | 0f496df2d9ba48faa808b5fa330de0da1a2d29d7 (diff) | |
| parent | 3b4797bce0050570e84bedd10e1b14e9320a3551 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index ccf9ee1dca8c..11c8bc87fdcb 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -1898,7 +1898,10 @@ enum ieee80211_sa_query_action { | |||
| 1898 | /* AKM suite selectors */ | 1898 | /* AKM suite selectors */ |
| 1899 | #define WLAN_AKM_SUITE_8021X 0x000FAC01 | 1899 | #define WLAN_AKM_SUITE_8021X 0x000FAC01 |
| 1900 | #define WLAN_AKM_SUITE_PSK 0x000FAC02 | 1900 | #define WLAN_AKM_SUITE_PSK 0x000FAC02 |
| 1901 | #define WLAN_AKM_SUITE_SAE 0x000FAC08 | 1901 | #define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05 |
| 1902 | #define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06 | ||
| 1903 | #define WLAN_AKM_SUITE_TDLS 0x000FAC07 | ||
| 1904 | #define WLAN_AKM_SUITE_SAE 0x000FAC08 | ||
| 1902 | #define WLAN_AKM_SUITE_FT_OVER_SAE 0x000FAC09 | 1905 | #define WLAN_AKM_SUITE_FT_OVER_SAE 0x000FAC09 |
| 1903 | 1906 | ||
| 1904 | #define WLAN_MAX_KEY_LEN 32 | 1907 | #define WLAN_MAX_KEY_LEN 32 |