staging: wilc1000: rename u8security to avoid datatype in variable name

Cleanup patch to avoid use of datatype in variable name to follow as
per linux coding style.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 70947a8b9a6f16b7616f3cc5e39464799909c62d..399dc1e31c11d2b462aea19f5f494c7d927c17d0 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -677,7 +677,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
        s32 ret = 0;
        u32 i;
        u32 sel_bssi_idx = UINT_MAX;
-       u8 u8security = NO_ENCRYPT;
+       u8 security = NO_ENCRYPT;
        enum AUTHTYPE auth_type = ANY;
        u32 cipher_group;
        struct wilc_priv *priv;
@@ -730,7 +730,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
        cipher_group = sme->crypto.cipher_group;
        if (cipher_group != NO_ENCRYPT) {
                if (cipher_group == WLAN_CIPHER_SUITE_WEP40) {
-                       u8security = ENCRYPT_ENABLED | WEP;
+                       security = ENCRYPT_ENABLED | WEP;
 
                        priv->wep_key_len[sme->key_idx] = sme->key_len;
                        memcpy(priv->wep_key[sme->key_idx], sme->key,
@@ -740,7 +740,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
                        wilc_add_wep_key_bss_sta(vif, sme->key, sme->key_len,
                                                 sme->key_idx);
                } else if (cipher_group == WLAN_CIPHER_SUITE_WEP104) {
-                       u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
+                       security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
 
                        priv->wep_key_len[sme->key_idx] = sme->key_len;
                        memcpy(priv->wep_key[sme->key_idx], sme->key,
@@ -751,14 +751,14 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
                                                 sme->key_idx);
                } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) {
                        if (cipher_group == WLAN_CIPHER_SUITE_TKIP)
-                               u8security = ENCRYPT_ENABLED | WPA2 | TKIP;
+                               security = ENCRYPT_ENABLED | WPA2 | TKIP;
                        else
-                               u8security = ENCRYPT_ENABLED | WPA2 | AES;
+                               security = ENCRYPT_ENABLED | WPA2 | AES;
                } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_1) {
                        if (cipher_group == WLAN_CIPHER_SUITE_TKIP)
-                               u8security = ENCRYPT_ENABLED | WPA | TKIP;
+                               security = ENCRYPT_ENABLED | WPA | TKIP;
                        else
-                               u8security = ENCRYPT_ENABLED | WPA | AES;
+                               security = ENCRYPT_ENABLED | WPA | AES;
                } else {
                        ret = -ENOTSUPP;
                        netdev_err(dev, "Not supported cipher\n");
@@ -773,9 +773,9 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
                        u32 ciphers_pairwise = sme->crypto.ciphers_pairwise[i];
 
                        if (ciphers_pairwise == WLAN_CIPHER_SUITE_TKIP)
-                               u8security = u8security | TKIP;
+                               security = security | TKIP;
                        else
-                               u8security = u8security | AES;
+                               security = security | AES;
                }
        }
 
@@ -807,7 +807,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
        ret = wilc_set_join_req(vif, nw_info->bssid, sme->ssid,
                                sme->ssid_len, sme->ie, sme->ie_len,
                                cfg_connect_result, (void *)priv,
-                               u8security, auth_type,
+                               security, auth_type,
                                nw_info->ch,
                                nw_info->join_params);
        if (ret != 0) {