diff options
| author | Ajay Singh | 2018-05-11 10:13:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-05-14 14:04:48 +0200 |
| commit | 36fef228ed3b8158b774e9cc60689ee2d6dfbad9 (patch) | |
| tree | 22b163be3c9371a50f69f34bb505003e41f728cf /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |
| parent | staging: wilc1000: fix line over 80 chars in wilc_create_wiphy() declaration (diff) | |
| download | kernel-qcow2-linux-36fef228ed3b8158b774e9cc60689ee2d6dfbad9.tar.gz kernel-qcow2-linux-36fef228ed3b8158b774e9cc60689ee2d6dfbad9.tar.xz kernel-qcow2-linux-36fef228ed3b8158b774e9cc60689ee2d6dfbad9.zip | |
staging: wilc1000: fix line over 80 characters in add_key()
Fix line over 80 character issue found by checkpatch.pl script in
add_key().
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_cfgoperations.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 9684d3445855..b67a170cf9b9 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -908,8 +908,7 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, } static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, - bool pairwise, - const u8 *mac_addr, struct key_params *params) + bool pairwise, const u8 *mac_addr, struct key_params *params) { s32 ret = 0, keylen = params->key_len; @@ -955,6 +954,8 @@ 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) { + struct wilc_wfi_key *key; + ret = wilc_wfi_cfg_allocate_wpa_entry(priv, key_index); if (ret) return -ENOMEM; @@ -974,21 +975,19 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, priv->wilc_groupkey = mode; - ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_gtk[key_index], - params); - if (ret) - return -ENOMEM; + key = priv->wilc_gtk[key_index]; } else { if (params->cipher == WLAN_CIPHER_SUITE_TKIP) mode = ENCRYPT_ENABLED | WPA | TKIP; else mode = priv->wilc_groupkey | AES; - ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_ptk[key_index], - params); - if (ret) - return -ENOMEM; + key = priv->wilc_ptk[key_index]; } + ret = wilc_wfi_cfg_copy_wpa_info(key, params); + if (ret) + return -ENOMEM; + op_mode = AP_MODE; } else { if (params->key_len > 16 && |