staging: wilc1000: handle error condition in add_key() and remove auth_type variable

Added the code to return correct error code in add_key() and also removed
'auth_type' variable. Now passing diretly to function instead of using
the 'auth_type' variable.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 9f147ee..1c9864b 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -922,7 +922,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
        const u8 *tx_mic = NULL;
        u8 mode = NO_ENCRYPT;
        u8 op_mode;
-       enum AUTHTYPE auth_type = ANY;
        struct wilc *wl;
        struct wilc_vif *vif;
 
@@ -936,24 +935,24 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
                if (priv->wdev->iftype == NL80211_IFTYPE_AP) {
                        wilc_wfi_cfg_copy_wep_info(priv, key_index, params);
 
-                       auth_type = OPEN_SYSTEM;
-
                        if (params->cipher == WLAN_CIPHER_SUITE_WEP40)
                                mode = ENCRYPT_ENABLED | WEP;
                        else
                                mode = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
 
-                       wilc_add_wep_key_bss_ap(vif, params->key,
-                                               params->key_len, key_index,
-                                               mode, auth_type);
+                       ret = wilc_add_wep_key_bss_ap(vif, params->key,
+                                                     params->key_len,
+                                                     key_index, mode,
+                                                     OPEN_SYSTEM);
                        break;
                }
                if (memcmp(params->key, priv->wep_key[key_index],
                           params->key_len)) {
                        wilc_wfi_cfg_copy_wep_info(priv, key_index, params);
 
-                       wilc_add_wep_key_bss_sta(vif, params->key,
-                                                params->key_len, key_index);
+                       ret = wilc_add_wep_key_bss_sta(vif, params->key,
+                                                      params->key_len,
+                                                      key_index);
                }
 
                break;
@@ -962,7 +961,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
        case WLAN_CIPHER_SUITE_CCMP:
                if (priv->wdev->iftype == NL80211_IFTYPE_AP ||
                    priv->wdev->iftype == NL80211_IFTYPE_P2P_GO) {
-                       wilc_wfi_cfg_allocate_wpa_entry(priv, key_index);
+                       ret = wilc_wfi_cfg_allocate_wpa_entry(priv, key_index);
+                       if (ret)
+                               return -ENOMEM;
 
                        if (params->key_len > 16 &&
                            params->cipher == WLAN_CIPHER_SUITE_TKIP) {
@@ -979,16 +980,20 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 
                                priv->wilc_groupkey = mode;
 
-                               wilc_wfi_cfg_copy_wpa_info(priv->wilc_gtk[key_index],
-                                                          params);
+                               ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_gtk[key_index],
+                                                                params);
+                               if (ret)
+                                       return -ENOMEM;
                        } else {
                                if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
                                        mode = ENCRYPT_ENABLED | WPA | TKIP;
                                else
                                        mode = priv->wilc_groupkey | AES;
 
-                               wilc_wfi_cfg_copy_wpa_info(priv->wilc_ptk[key_index],
-                                                          params);
+                               ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_ptk[key_index],
+                                                                params);
+                               if (ret)
+                                       return -ENOMEM;
                        }
                        op_mode = AP_MODE;
                } else {
@@ -1002,17 +1007,16 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
                        op_mode = STATION_MODE;
                }
 
-               if (!pairwise) {
-                       wilc_add_rx_gtk(vif, params->key, keylen,
-                                       key_index, params->seq_len,
-                                       params->seq, rx_mic,
-                                       tx_mic, op_mode,
-                                       mode);
-               } else {
-                       wilc_add_ptk(vif, params->key, keylen,
-                                    mac_addr, rx_mic, tx_mic,
-                                    op_mode, mode, key_index);
-               }
+               if (!pairwise)
+                       ret = wilc_add_rx_gtk(vif, params->key, keylen,
+                                             key_index, params->seq_len,
+                                             params->seq, rx_mic, tx_mic,
+                                             op_mode, mode);
+               else
+                       ret = wilc_add_ptk(vif, params->key, keylen, mac_addr,
+                                          rx_mic, tx_mic, op_mode, mode,
+                                          key_index);
+
                break;
 
        default: