diff options
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r-- | net/wireless/util.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index d072bff463aa..5be9ed7ae1e9 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c | |||
@@ -157,26 +157,25 @@ int cfg80211_validate_key_settings(struct key_params *params, int key_idx, | |||
157 | params->cipher != WLAN_CIPHER_SUITE_WEP104) | 157 | params->cipher != WLAN_CIPHER_SUITE_WEP104) |
158 | return -EINVAL; | 158 | return -EINVAL; |
159 | 159 | ||
160 | /* TODO: add definitions for the lengths to linux/ieee80211.h */ | ||
161 | switch (params->cipher) { | 160 | switch (params->cipher) { |
162 | case WLAN_CIPHER_SUITE_WEP40: | 161 | case WLAN_CIPHER_SUITE_WEP40: |
163 | if (params->key_len != 5) | 162 | if (params->key_len != WLAN_KEY_LEN_WEP40) |
164 | return -EINVAL; | 163 | return -EINVAL; |
165 | break; | 164 | break; |
166 | case WLAN_CIPHER_SUITE_TKIP: | 165 | case WLAN_CIPHER_SUITE_TKIP: |
167 | if (params->key_len != 32) | 166 | if (params->key_len != WLAN_KEY_LEN_TKIP) |
168 | return -EINVAL; | 167 | return -EINVAL; |
169 | break; | 168 | break; |
170 | case WLAN_CIPHER_SUITE_CCMP: | 169 | case WLAN_CIPHER_SUITE_CCMP: |
171 | if (params->key_len != 16) | 170 | if (params->key_len != WLAN_KEY_LEN_CCMP) |
172 | return -EINVAL; | 171 | return -EINVAL; |
173 | break; | 172 | break; |
174 | case WLAN_CIPHER_SUITE_WEP104: | 173 | case WLAN_CIPHER_SUITE_WEP104: |
175 | if (params->key_len != 13) | 174 | if (params->key_len != WLAN_KEY_LEN_WEP104) |
176 | return -EINVAL; | 175 | return -EINVAL; |
177 | break; | 176 | break; |
178 | case WLAN_CIPHER_SUITE_AES_CMAC: | 177 | case WLAN_CIPHER_SUITE_AES_CMAC: |
179 | if (params->key_len != 16) | 178 | if (params->key_len != WLAN_KEY_LEN_AES_CMAC) |
180 | return -EINVAL; | 179 | return -EINVAL; |
181 | break; | 180 | break; |
182 | default: | 181 | default: |