aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-08 07:09:08 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-05-16 16:39:41 -0400
commit4325f6caad98c075b39f0eaaac6693a0dd43f646 (patch)
treefe0b8cf54b924d0206db99fca8966ff1f601325e /include
parent04a161f4609dfa387313456fa7ea469fff12cc0d (diff)
wireless: move crypto constants to ieee80211.h
mac80211 and the Intel drivers all define crypto constants, move them to ieee80211.h instead. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ieee80211.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 06b0ed0154a4..d826e5a84af0 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1829,6 +1829,15 @@ enum ieee80211_key_len {
1829 WLAN_KEY_LEN_AES_CMAC = 16, 1829 WLAN_KEY_LEN_AES_CMAC = 16,
1830}; 1830};
1831 1831
1832#define IEEE80211_WEP_IV_LEN 4
1833#define IEEE80211_WEP_ICV_LEN 4
1834#define IEEE80211_CCMP_HDR_LEN 8
1835#define IEEE80211_CCMP_MIC_LEN 8
1836#define IEEE80211_CCMP_PN_LEN 6
1837#define IEEE80211_TKIP_IV_LEN 8
1838#define IEEE80211_TKIP_ICV_LEN 4
1839#define IEEE80211_CMAC_PN_LEN 6
1840
1832/* Public action codes */ 1841/* Public action codes */
1833enum ieee80211_pub_actioncode { 1842enum ieee80211_pub_actioncode {
1834 WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4, 1843 WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,