Commit 36fef228 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

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: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d48bfae
...@@ -908,8 +908,7 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, ...@@ -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, static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
bool pairwise, bool pairwise, const u8 *mac_addr, struct key_params *params)
const u8 *mac_addr, struct key_params *params)
{ {
s32 ret = 0, keylen = params->key_len; 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, ...@@ -955,6 +954,8 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
case WLAN_CIPHER_SUITE_CCMP: case WLAN_CIPHER_SUITE_CCMP:
if (priv->wdev->iftype == NL80211_IFTYPE_AP || if (priv->wdev->iftype == NL80211_IFTYPE_AP ||
priv->wdev->iftype == NL80211_IFTYPE_P2P_GO) { priv->wdev->iftype == NL80211_IFTYPE_P2P_GO) {
struct wilc_wfi_key *key;
ret = wilc_wfi_cfg_allocate_wpa_entry(priv, key_index); ret = wilc_wfi_cfg_allocate_wpa_entry(priv, key_index);
if (ret) if (ret)
return -ENOMEM; return -ENOMEM;
...@@ -974,21 +975,19 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -974,21 +975,19 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
priv->wilc_groupkey = mode; priv->wilc_groupkey = mode;
ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_gtk[key_index], key = priv->wilc_gtk[key_index];
params);
if (ret)
return -ENOMEM;
} else { } else {
if (params->cipher == WLAN_CIPHER_SUITE_TKIP) if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
mode = ENCRYPT_ENABLED | WPA | TKIP; mode = ENCRYPT_ENABLED | WPA | TKIP;
else else
mode = priv->wilc_groupkey | AES; mode = priv->wilc_groupkey | AES;
ret = wilc_wfi_cfg_copy_wpa_info(priv->wilc_ptk[key_index], key = priv->wilc_ptk[key_index];
params);
if (ret)
return -ENOMEM;
} }
ret = wilc_wfi_cfg_copy_wpa_info(key, params);
if (ret)
return -ENOMEM;
op_mode = AP_MODE; op_mode = AP_MODE;
} else { } else {
if (params->key_len > 16 && if (params->key_len > 16 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment