aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ieee80211.h
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-21 12:54:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-21 23:02:30 -0400
commite0d369d1d969fc9e4fd08a20f6dad04d369aceea (patch)
tree9ce4d6a3938960b35c3d7c7b3da4bb546f8b1d95 /include/net/ieee80211.h
parent259bf1fd8a7cc0f6b47fd8a9ac5e2dfc33182a3d (diff)
[PATCH] ieee82011: Added WE-18 support to default wireless extension handler
tree 1536f39c18756698d033da72c49300a561be1289 parent 07172d7c9f10ee3d05d6f6489ba6d6ee2628da06 author Liu Hong <hong.liu@intel.com> 1124436225 -0500 committer James Ketrenos <jketreno@linux.intel.com> 1127312664 -0500 Added WE-18 support to default wireless extension handler in ieee80211 subsystem. Updated patch since last send to account for ieee80211_device parameter being added to the crypto init method. Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'include/net/ieee80211.h')
-rw-r--r--include/net/ieee80211.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index c7ab7cd9de13..dfc5d65cc6c1 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -447,6 +447,11 @@ struct ieee80211_device;
447#define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */ 447#define SEC_LEVEL_2_CKIP 3 /* Level 1 + CKIP */
448#define SEC_LEVEL_3 4 /* Level 2 + CCMP */ 448#define SEC_LEVEL_3 4 /* Level 2 + CCMP */
449 449
450#define SEC_ALG_NONE 0
451#define SEC_ALG_WEP 1
452#define SEC_ALG_TKIP 2
453#define SEC_ALG_CCMP 3
454
450#define WEP_KEYS 4 455#define WEP_KEYS 4
451#define WEP_KEY_LEN 13 456#define WEP_KEY_LEN 13
452#define SCM_KEY_LEN 32 457#define SCM_KEY_LEN 32
@@ -456,6 +461,7 @@ struct ieee80211_security {
456 u16 active_key:2, 461 u16 active_key:2,
457 enabled:1, 462 enabled:1,
458 auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1; 463 auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1;
464 u8 encode_alg[WEP_KEYS];
459 u8 key_sizes[WEP_KEYS]; 465 u8 key_sizes[WEP_KEYS];
460 u8 keys[WEP_KEYS][SCM_KEY_LEN]; 466 u8 keys[WEP_KEYS][SCM_KEY_LEN];
461 u8 level; 467 u8 level;
@@ -824,6 +830,14 @@ extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
824extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee, 830extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
825 struct iw_request_info *info, 831 struct iw_request_info *info,
826 union iwreq_data *wrqu, char *key); 832 union iwreq_data *wrqu, char *key);
833#if WIRELESS_EXT > 17
834extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
835 struct iw_request_info *info,
836 union iwreq_data *wrqu, char *extra);
837extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
838 struct iw_request_info *info,
839 union iwreq_data *wrqu, char *extra);
840#endif
827 841
828extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee) 842extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
829{ 843{