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

staging: wilc1000: rename variable using datatype in their name in add_key()

Cleanup changes to use variable name as per linux coding style.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96a3c871
...@@ -868,9 +868,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -868,9 +868,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
struct wilc_priv *priv; struct wilc_priv *priv;
const u8 *rx_mic = NULL; const u8 *rx_mic = NULL;
const u8 *tx_mic = NULL; const u8 *tx_mic = NULL;
u8 u8mode = NO_ENCRYPT; u8 mode = NO_ENCRYPT;
u8 u8gmode = NO_ENCRYPT; u8 gmode = NO_ENCRYPT;
u8 u8pmode = NO_ENCRYPT; u8 pmode = NO_ENCRYPT;
enum AUTHTYPE auth_type = ANY; enum AUTHTYPE auth_type = ANY;
struct wilc *wl; struct wilc *wl;
struct wilc_vif *vif; struct wilc_vif *vif;
...@@ -889,13 +889,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -889,13 +889,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
auth_type = OPEN_SYSTEM; auth_type = OPEN_SYSTEM;
if (params->cipher == WLAN_CIPHER_SUITE_WEP40) if (params->cipher == WLAN_CIPHER_SUITE_WEP40)
u8mode = ENCRYPT_ENABLED | WEP; mode = ENCRYPT_ENABLED | WEP;
else else
u8mode = ENCRYPT_ENABLED | WEP | WEP_EXTENDED; mode = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
wilc_add_wep_key_bss_ap(vif, params->key, wilc_add_wep_key_bss_ap(vif, params->key,
params->key_len, key_index, params->key_len, key_index,
u8mode, auth_type); mode, auth_type);
break; break;
} }
if (memcmp(params->key, priv->wep_key[key_index], params->key_len)) { if (memcmp(params->key, priv->wep_key[key_index], params->key_len)) {
...@@ -924,11 +924,11 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -924,11 +924,11 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
if (!pairwise) { if (!pairwise) {
if (params->cipher == WLAN_CIPHER_SUITE_TKIP) if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
u8gmode = ENCRYPT_ENABLED | WPA | TKIP; gmode = ENCRYPT_ENABLED | WPA | TKIP;
else else
u8gmode = ENCRYPT_ENABLED | WPA2 | AES; gmode = ENCRYPT_ENABLED | WPA2 | AES;
priv->wilc_groupkey = u8gmode; priv->wilc_groupkey = gmode;
if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
tx_mic = params->key + 24; tx_mic = params->key + 24;
...@@ -953,13 +953,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -953,13 +953,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
wilc_add_rx_gtk(vif, params->key, keylen, wilc_add_rx_gtk(vif, params->key, keylen,
key_index, params->seq_len, key_index, params->seq_len,
params->seq, rx_mic, params->seq, rx_mic,
tx_mic, AP_MODE, u8gmode); tx_mic, AP_MODE, gmode);
} else { } else {
if (params->cipher == WLAN_CIPHER_SUITE_TKIP) if (params->cipher == WLAN_CIPHER_SUITE_TKIP)
u8pmode = ENCRYPT_ENABLED | WPA | TKIP; pmode = ENCRYPT_ENABLED | WPA | TKIP;
else else
u8pmode = priv->wilc_groupkey | AES; pmode = priv->wilc_groupkey | AES;
if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
tx_mic = params->key + 24; tx_mic = params->key + 24;
...@@ -983,13 +983,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -983,13 +983,13 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
wilc_add_ptk(vif, params->key, keylen, wilc_add_ptk(vif, params->key, keylen,
mac_addr, rx_mic, tx_mic, mac_addr, rx_mic, tx_mic,
AP_MODE, u8pmode, key_index); AP_MODE, pmode, key_index);
} }
break; break;
} }
{ {
u8mode = 0; mode = 0;
if (!pairwise) { if (!pairwise) {
if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
rx_mic = params->key + 24; rx_mic = params->key + 24;
...@@ -1001,7 +1001,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -1001,7 +1001,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
key_index, params->seq_len, key_index, params->seq_len,
params->seq, rx_mic, params->seq, rx_mic,
tx_mic, STATION_MODE, tx_mic, STATION_MODE,
u8mode); mode);
} else { } else {
if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) {
rx_mic = params->key + 24; rx_mic = params->key + 24;
...@@ -1011,7 +1011,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -1011,7 +1011,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
wilc_add_ptk(vif, params->key, keylen, wilc_add_ptk(vif, params->key, keylen,
mac_addr, rx_mic, tx_mic, mac_addr, rx_mic, tx_mic,
STATION_MODE, u8mode, key_index); STATION_MODE, mode, key_index);
} }
} }
break; break;
......
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