diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 23:43:17 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 23:43:17 +0400 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /include/linux | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
| download | linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 776cbb80d098..e526a8cecb70 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1857,6 +1857,7 @@ enum ieee80211_key_len { WLAN_KEY_LEN_CCMP = 16, WLAN_KEY_LEN_TKIP = 32, WLAN_KEY_LEN_AES_CMAC = 16, + WLAN_KEY_LEN_SMS4 = 32, }; #define IEEE80211_WEP_IV_LEN 4 @@ -1902,6 +1903,7 @@ enum ieee80211_tdls_actioncode { #define WLAN_EXT_CAPA5_TDLS_PROHIBITED BIT(6) #define WLAN_EXT_CAPA8_OPMODE_NOTIF BIT(6) +#define WLAN_EXT_CAPA8_TDLS_WIDE_BW_ENABLED BIT(7) /* TDLS specific payload type in the LLC/SNAP header */ #define WLAN_TDLS_SNAP_RFTYPE 0x2 |