diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 27 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h index 7e36ecb27575..65cd8ae363b4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-commands.h | |||
@@ -84,6 +84,9 @@ enum { | |||
84 | REPLY_REMOVE_STA = 0x19, /* not used */ | 84 | REPLY_REMOVE_STA = 0x19, /* not used */ |
85 | REPLY_REMOVE_ALL_STA = 0x1a, /* not used */ | 85 | REPLY_REMOVE_ALL_STA = 0x1a, /* not used */ |
86 | 86 | ||
87 | /* Security */ | ||
88 | REPLY_WEPKEY = 0x20, | ||
89 | |||
87 | /* RX, TX, LEDs */ | 90 | /* RX, TX, LEDs */ |
88 | REPLY_TX = 0x1c, | 91 | REPLY_TX = 0x1c, |
89 | REPLY_RATE_SCALE = 0x47, /* 3945 only */ | 92 | REPLY_RATE_SCALE = 0x47, /* 3945 only */ |
@@ -850,6 +853,30 @@ struct iwl4965_add_sta_resp { | |||
850 | u8 status; /* ADD_STA_* */ | 853 | u8 status; /* ADD_STA_* */ |
851 | } __attribute__ ((packed)); | 854 | } __attribute__ ((packed)); |
852 | 855 | ||
856 | /* | ||
857 | * REPLY_WEP_KEY = 0x20 | ||
858 | */ | ||
859 | struct iwl_wep_key { | ||
860 | u8 key_index; | ||
861 | u8 key_offset; | ||
862 | u8 reserved1[2]; | ||
863 | u8 key_size; | ||
864 | u8 reserved2[3]; | ||
865 | u8 key[16]; | ||
866 | } __attribute__ ((packed)); | ||
867 | |||
868 | struct iwl_wep_cmd { | ||
869 | u8 num_keys; | ||
870 | u8 global_key_type; | ||
871 | u8 flags; | ||
872 | u8 reserved; | ||
873 | struct iwl_wep_key key[0]; | ||
874 | } __attribute__ ((packed)); | ||
875 | |||
876 | #define WEP_KEY_WEP_TYPE 1 | ||
877 | #define WEP_KEYS_MAX 4 | ||
878 | #define WEP_INVALID_OFFSET 0xff | ||
879 | #define WEP_KEY_LEN_128 13 | ||
853 | 880 | ||
854 | /****************************************************************************** | 881 | /****************************************************************************** |
855 | * (4) | 882 | * (4) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 1f8c2999805b..fdb27f1cdc08 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c | |||
@@ -51,6 +51,7 @@ const char *get_cmd_string(u8 cmd) | |||
51 | IWL_CMD(REPLY_ADD_STA); | 51 | IWL_CMD(REPLY_ADD_STA); |
52 | IWL_CMD(REPLY_REMOVE_STA); | 52 | IWL_CMD(REPLY_REMOVE_STA); |
53 | IWL_CMD(REPLY_REMOVE_ALL_STA); | 53 | IWL_CMD(REPLY_REMOVE_ALL_STA); |
54 | IWL_CMD(REPLY_WEPKEY); | ||
54 | IWL_CMD(REPLY_TX); | 55 | IWL_CMD(REPLY_TX); |
55 | IWL_CMD(REPLY_RATE_SCALE); | 56 | IWL_CMD(REPLY_RATE_SCALE); |
56 | IWL_CMD(REPLY_LEDS_CMD); | 57 | IWL_CMD(REPLY_LEDS_CMD); |