staging: wilc1000: remove inner block {} and resetting of mode variable

Cleanup fixes to remove the uncessary inner block { /* */ } and setting
of 'mode' 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 a80d4d71569ad2e8d51ae67a3caa4551514794a8..4eb697fa318abaabf2bb3669c8a377dec634db46 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1008,31 +1008,28 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
                        break;
                }
 
-               {
-                       mode = 0;
-                       if (!pairwise) {
-                               if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
-                                       rx_mic = params->key + 24;
-                                       tx_mic = params->key + 16;
-                                       keylen = params->key_len - 16;
-                               }
-
-                               wilc_add_rx_gtk(vif, params->key, keylen,
-                                               key_index, params->seq_len,
-                                               params->seq, rx_mic,
-                                               tx_mic, STATION_MODE,
-                                               mode);
-                       } else {
-                               if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
-                                       rx_mic = params->key + 24;
-                                       tx_mic = params->key + 16;
-                                       keylen = params->key_len - 16;
-                               }
+               if (!pairwise) {
+                       if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
+                               rx_mic = params->key + 24;
+                               tx_mic = params->key + 16;
+                               keylen = params->key_len - 16;
+                       }
 
-                               wilc_add_ptk(vif, params->key, keylen,
-                                            mac_addr, rx_mic, tx_mic,
-                                            STATION_MODE, mode, key_index);
+                       wilc_add_rx_gtk(vif, params->key, keylen,
+                                       key_index, params->seq_len,
+                                       params->seq, rx_mic,
+                                       tx_mic, STATION_MODE,
+                                       mode);
+               } else {
+                       if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
+                               rx_mic = params->key + 24;
+                               tx_mic = params->key + 16;
+                               keylen = params->key_len - 16;
                        }
+
+                       wilc_add_ptk(vif, params->key, keylen,
+                                    mac_addr, rx_mic, tx_mic,
+                                    STATION_MODE, mode, key_index);
                }
                break;