From: Johannes Berg Date: Wed, 8 May 2013 11:09:08 +0000 (+0200) Subject: wireless: move crypto constants to ieee80211.h X-Git-Tag: 1.9.9~39 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=e32f5f929b7d47221b4e6662f8a0c45b6ff8fc8e;p=carl9170fw.git 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 Signed-off-by: Johannes Berg Signed-off-by: Christian Lamparter --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 8281e92..a334caf 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1850,6 +1850,15 @@ enum ieee80211_key_len { WLAN_KEY_LEN_AES_CMAC = 16, }; +#define IEEE80211_WEP_IV_LEN 4 +#define IEEE80211_WEP_ICV_LEN 4 +#define IEEE80211_CCMP_HDR_LEN 8 +#define IEEE80211_CCMP_MIC_LEN 8 +#define IEEE80211_CCMP_PN_LEN 6 +#define IEEE80211_TKIP_IV_LEN 8 +#define IEEE80211_TKIP_ICV_LEN 4 +#define IEEE80211_CMAC_PN_LEN 6 + /* Public action codes */ enum ieee80211_pub_actioncode { WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,