diff options
| author | Ajay Singh <ajay.kathat@microchip.com> | 2018-04-23 22:03:17 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-25 15:54:14 +0200 |
| commit | d68331a2c7cf891e623b75f0166ef63cb0b2c3a3 (patch) | |
| tree | c34c95800a9a27445f6d474c86ff223fb9e8f288 /drivers/staging | |
| parent | 7cec84fdfd88ac058ac3df5dd3ac0ad10b9124a4 (diff) | |
| download | linux-d68331a2c7cf891e623b75f0166ef63cb0b2c3a3.tar.bz2 | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index a80d4d71569a..4eb697fa318a 100644 --- 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; |