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

staging: wilc1000: rename WILC_WFI_wep_key & WILC_WFI_wep_key_len

Cleanup patch to use lower case for 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 e3b13cbf
...@@ -725,15 +725,15 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -725,15 +725,15 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
return ret; return ret;
} }
memset(priv->WILC_WFI_wep_key, 0, sizeof(priv->WILC_WFI_wep_key)); memset(priv->wep_key, 0, sizeof(priv->wep_key));
memset(priv->WILC_WFI_wep_key_len, 0, sizeof(priv->WILC_WFI_wep_key_len)); memset(priv->wep_key_len, 0, sizeof(priv->wep_key_len));
if (sme->crypto.cipher_group != NO_ENCRYPT) { if (sme->crypto.cipher_group != NO_ENCRYPT) {
if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP40) { if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP40) {
u8security = ENCRYPT_ENABLED | WEP; u8security = ENCRYPT_ENABLED | WEP;
priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len; priv->wep_key_len[sme->key_idx] = sme->key_len;
memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len); memcpy(priv->wep_key[sme->key_idx], sme->key, sme->key_len);
wilc_set_wep_default_keyid(vif, sme->key_idx); wilc_set_wep_default_keyid(vif, sme->key_idx);
wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len, wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len,
...@@ -741,8 +741,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -741,8 +741,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
} else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) { } else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) {
u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED; u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len; priv->wep_key_len[sme->key_idx] = sme->key_len;
memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len); memcpy(priv->wep_key[sme->key_idx], sme->key, sme->key_len);
wilc_set_wep_default_keyid(vif, sme->key_idx); wilc_set_wep_default_keyid(vif, sme->key_idx);
wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len, wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len,
...@@ -883,8 +883,8 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -883,8 +883,8 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP40:
case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_WEP104:
if (priv->wdev->iftype == NL80211_IFTYPE_AP) { if (priv->wdev->iftype == NL80211_IFTYPE_AP) {
priv->WILC_WFI_wep_key_len[key_index] = params->key_len; priv->wep_key_len[key_index] = params->key_len;
memcpy(priv->WILC_WFI_wep_key[key_index], params->key, params->key_len); memcpy(priv->wep_key[key_index], params->key, params->key_len);
auth_type = OPEN_SYSTEM; auth_type = OPEN_SYSTEM;
...@@ -898,9 +898,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, ...@@ -898,9 +898,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
u8mode, auth_type); u8mode, auth_type);
break; break;
} }
if (memcmp(params->key, priv->WILC_WFI_wep_key[key_index], params->key_len)) { if (memcmp(params->key, priv->wep_key[key_index], params->key_len)) {
priv->WILC_WFI_wep_key_len[key_index] = params->key_len; priv->wep_key_len[key_index] = params->key_len;
memcpy(priv->WILC_WFI_wep_key[key_index], params->key, params->key_len); memcpy(priv->wep_key[key_index], params->key, params->key_len);
wilc_add_wep_key_bss_sta(vif, params->key, wilc_add_wep_key_bss_sta(vif, params->key,
params->key_len, key_index); params->key_len, key_index);
...@@ -1059,10 +1059,10 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, ...@@ -1059,10 +1059,10 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
} }
if (key_index >= 0 && key_index <= 3) { if (key_index >= 0 && key_index <= 3) {
if (priv->WILC_WFI_wep_key_len[key_index]) { if (priv->wep_key_len[key_index]) {
memset(priv->WILC_WFI_wep_key[key_index], 0, memset(priv->wep_key[key_index], 0,
priv->WILC_WFI_wep_key_len[key_index]); priv->wep_key_len[key_index]);
priv->WILC_WFI_wep_key_len[key_index] = 0; priv->wep_key_len[key_index] = 0;
wilc_remove_wep_key(vif, key_index); wilc_remove_wep_key(vif, key_index);
} }
} else { } else {
......
...@@ -124,8 +124,8 @@ struct wilc_priv { ...@@ -124,8 +124,8 @@ struct wilc_priv {
struct host_if_drv *hif_drv; struct host_if_drv *hif_drv;
struct host_if_pmkid_attr pmkid_list; struct host_if_pmkid_attr pmkid_list;
struct WILC_WFI_stats netstats; struct WILC_WFI_stats netstats;
u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104]; u8 wep_key[4][WLAN_KEY_LEN_WEP104];
u8 WILC_WFI_wep_key_len[4]; u8 wep_key_len[4];
/* The real interface that the monitor is on */ /* The real interface that the monitor is on */
struct net_device *real_ndev; struct net_device *real_ndev;
struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
......
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