2 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 34de8b21f6d4..a9173d5434d1 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1092,6 +1092,7 @@ enum ieee80211_key_len {
         WLAN_KEY_LEN_WEP104 = 13,
         WLAN_KEY_LEN_CCMP = 16,
         WLAN_KEY_LEN_TKIP = 32,
+        WLAN_KEY_LEN_AES_CMAC = 16,
 };
 
 /*
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,
             params->cipher != WLAN_CIPHER_SUITE_WEP104)
                 return -EINVAL;
 
-        /* TODO: add definitions for the lengths to linux/ieee80211.h */
         switch (params->cipher) {
         case WLAN_CIPHER_SUITE_WEP40:
-                if (params->key_len != 5)
+                if (params->key_len != WLAN_KEY_LEN_WEP40)
                         return -EINVAL;
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
-                if (params->key_len != 32)
+                if (params->key_len != WLAN_KEY_LEN_TKIP)
                         return -EINVAL;
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
-                if (params->key_len != 16)
+                if (params->key_len != WLAN_KEY_LEN_CCMP)
                         return -EINVAL;
                 break;
         case WLAN_CIPHER_SUITE_WEP104:
-                if (params->key_len != 13)
+                if (params->key_len != WLAN_KEY_LEN_WEP104)
                         return -EINVAL;
                 break;
         case WLAN_CIPHER_SUITE_AES_CMAC:
-                if (params->key_len != 16)
+                if (params->key_len != WLAN_KEY_LEN_AES_CMAC)
                         return -EINVAL;
                 break;
         default: