All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ajay Singh <ajay.kathat@microchip.com>
To: <linux-wireless@vger.kernel.org>
Cc: <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
	<ganesh.krishna@microchip.com>, <venkateswara.kaja@microchip.com>,
	<aditya.shankar@microchip.com>, <claudiu.beznea@microchip.com>,
	<adham.abozaeid@Microchip.com>,
	Ajay Singh <ajay.kathat@microchip.com>
Subject: [PATCH 01/22] staging: wilc1000: rename WILC_WFI_wep_key & WILC_WFI_wep_key_len
Date: Wed, 18 Apr 2018 17:09:03 +0530	[thread overview]
Message-ID: <1524051564-15497-2-git-send-email-ajay.kathat@microchip.com> (raw)
In-Reply-To: <1524051564-15497-1-git-send-email-ajay.kathat@microchip.com>

Cleanup patch to use lower case for variable name as per linux coding
style.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 30 +++++++++++------------
 drivers/staging/wilc1000/wilc_wfi_netdevice.h     |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3139ead..bdc6c85 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -726,15 +726,15 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 		return ret;
 	}
 
-	memset(priv->WILC_WFI_wep_key, 0, sizeof(priv->WILC_WFI_wep_key));
-	memset(priv->WILC_WFI_wep_key_len, 0, sizeof(priv->WILC_WFI_wep_key_len));
+	memset(priv->wep_key, 0, sizeof(priv->wep_key));
+	memset(priv->wep_key_len, 0, sizeof(priv->wep_key_len));
 
 	if (sme->crypto.cipher_group != NO_ENCRYPT) {
 		if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP40) {
 			u8security = ENCRYPT_ENABLED | WEP;
 
-			priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;
-			memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);
+			priv->wep_key_len[sme->key_idx] = 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_add_wep_key_bss_sta(vif, sme->key, sme->key_len,
@@ -742,8 +742,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
 		} else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104)   {
 			u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
 
-			priv->WILC_WFI_wep_key_len[sme->key_idx] = sme->key_len;
-			memcpy(priv->WILC_WFI_wep_key[sme->key_idx], sme->key, sme->key_len);
+			priv->wep_key_len[sme->key_idx] = 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_add_wep_key_bss_sta(vif, sme->key, sme->key_len,
@@ -884,8 +884,8 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 	case WLAN_CIPHER_SUITE_WEP40:
 	case WLAN_CIPHER_SUITE_WEP104:
 		if (priv->wdev->iftype == NL80211_IFTYPE_AP) {
-			priv->WILC_WFI_wep_key_len[key_index] = params->key_len;
-			memcpy(priv->WILC_WFI_wep_key[key_index], params->key, params->key_len);
+			priv->wep_key_len[key_index] = params->key_len;
+			memcpy(priv->wep_key[key_index], params->key, params->key_len);
 
 			auth_type = OPEN_SYSTEM;
 
@@ -899,9 +899,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
 						u8mode, auth_type);
 			break;
 		}
-		if (memcmp(params->key, priv->WILC_WFI_wep_key[key_index], params->key_len)) {
-			priv->WILC_WFI_wep_key_len[key_index] = params->key_len;
-			memcpy(priv->WILC_WFI_wep_key[key_index], params->key, params->key_len);
+		if (memcmp(params->key, priv->wep_key[key_index], params->key_len)) {
+			priv->wep_key_len[key_index] = params->key_len;
+			memcpy(priv->wep_key[key_index], params->key, params->key_len);
 
 			wilc_add_wep_key_bss_sta(vif, params->key,
 						 params->key_len, key_index);
@@ -1060,10 +1060,10 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
 	}
 
 	if (key_index >= 0 && key_index <= 3) {
-		if (priv->WILC_WFI_wep_key_len[key_index]) {
-			memset(priv->WILC_WFI_wep_key[key_index], 0,
-			       priv->WILC_WFI_wep_key_len[key_index]);
-			priv->WILC_WFI_wep_key_len[key_index] = 0;
+		if (priv->wep_key_len[key_index]) {
+			memset(priv->wep_key[key_index], 0,
+			       priv->wep_key_len[key_index]);
+			priv->wep_key_len[key_index] = 0;
 			wilc_remove_wep_key(vif, key_index);
 		}
 	} else {
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index d62c4f1..bd0c98a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -124,8 +124,8 @@ struct wilc_priv {
 	struct host_if_drv *hif_drv;
 	struct host_if_pmkid_attr pmkid_list;
 	struct WILC_WFI_stats netstats;
-	u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
-	u8 WILC_WFI_wep_key_len[4];
+	u8 wep_key[4][WLAN_KEY_LEN_WEP104];
+	u8 wep_key_len[4];
 	/* The real interface that the monitor is on */
 	struct net_device *real_ndev;
 	struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
-- 
2.7.4

  reply	other threads:[~2018-04-18 11:40 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-18 11:39 [PATCH 00/22] staging: wilc1000: cleanup patches to follow linux coding style Ajay Singh
2018-04-18 11:39 ` Ajay Singh [this message]
2018-04-18 11:39 ` [PATCH 02/22] staging: wilc1000: rename variable using datatype in their name in add_key() Ajay Singh
2018-04-18 11:39 ` [PATCH 03/22] staging: wilc1000: split add_key() to avoid line over 80 chars Ajay Singh
2018-04-18 11:39 ` [PATCH 04/22] staging: wilc1000: remove inner block {} and resetting of mode variable Ajay Singh
2018-04-18 11:39 ` [PATCH 05/22] staging: wilc1000: refactor add_key() to avoid duplicated code Ajay Singh
2018-04-18 11:39 ` [PATCH 06/22] staging: wilc1000: handle error condition in add_key() and remove auth_type variable Ajay Singh
2018-04-18 11:39 ` [PATCH 07/22] staging: wilc1000: use sizeof(variable) for memory allocated to store key info Ajay Singh
2018-04-18 11:39 ` [PATCH 08/22] staging: wilc1000: fix line over 80 chars in change_station() Ajay Singh
2018-04-18 11:39 ` [PATCH 09/22] staging: wilc1000: rename WID_LOGTerminal_Switch to avoid camelCase Ajay Singh
2018-04-18 11:39 ` [PATCH 10/22] staging: wilc1000: added identifiers name in function definations Ajay Singh
2018-04-18 11:39 ` [PATCH 11/22] staging: wilc1000: remove unused macros in wilc module Ajay Singh
2018-04-18 11:39 ` [PATCH 12/22] staging: wilc1000: remove multiple define used for MAX_SSID_LEN Ajay Singh
2018-04-18 11:39 ` [PATCH 13/22] staging: wilc1000: remove multiple define for mac connect and disconnect Ajay Singh
2018-04-18 11:39 ` [PATCH 14/22] staging: wilc1000: remove the use of goto label in spi_cmd_complete() Ajay Singh
2018-04-18 11:39 ` [PATCH 15/22] staging: wilc1000: remove the use of goto label in wilc_spi_read_size() Ajay Singh
2018-04-18 11:39 ` [PATCH 16/22] staging: wilc1000: remove the use of goto label in wilc_spi_read_int() Ajay Singh
2018-04-18 11:39 ` [PATCH 17/22] staging: wilc1000: remove goto label '_done_' in handle_listen_state_expired() Ajay Singh
2018-04-18 11:39 ` [PATCH 18/22] staging: wilc1000: remove the use of goto label in wilc_init() Ajay Singh
2018-04-18 11:39 ` [PATCH 19/22] staging: wilc1000: rename goto label '_fail_' linux naming convension Ajay Singh
2018-04-18 11:39 ` [PATCH 20/22] staging: wilc1000: rename goto labels starting with '_' in wilc1000_wlan_init() Ajay Singh
2018-04-18 11:39 ` [PATCH 21/22] staging: wilc1000: remove the use of goto label in wilc_spi_clear_int_ext() Ajay Singh
2018-04-18 11:39 ` [PATCH 22/22] staging: wilc1000: rename pu32InactiveTime to avoid camelCase issue Ajay Singh
2018-04-23 13:45 ` [PATCH 00/22] staging: wilc1000: cleanup patches to follow linux coding style Greg KH
2018-04-23 14:01   ` Ajay Singh
2018-04-23 14:11     ` Greg KH
2018-04-23 14:44     ` Claudiu Beznea

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524051564-15497-2-git-send-email-ajay.kathat@microchip.com \
    --to=ajay.kathat@microchip.com \
    --cc=adham.abozaeid@Microchip.com \
    --cc=aditya.shankar@microchip.com \
    --cc=claudiu.beznea@microchip.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=ganesh.krishna@microchip.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=venkateswara.kaja@microchip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.