[PATCH v4 01/11] staging: r8188eu: use Linux kernel variable naming convention (original) (raw)

From: Deepak R Varma drv@mailo.com To: outreachy@lists.linux.dev, Larry.Finger@lwfinger.net, phil@philpotter.co.uk, paskripkin@gmail.com, gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, kumarpraveen@linux.microsoft.com, saurabh.truth@gmail.com Subject: [PATCH v4 01/11] staging: r8188eu: use Linux kernel variable naming convention Date: Fri, 21 Oct 2022 02:56:47 +0530 [thread overview] Message-ID: a107c527e9032c22a62e93ff12d5fae625e70212.1666299151.git.drv@mailo.com () In-Reply-To: <cover.1666299151.git.drv@mailo.com>

Follow the Linux Kernel coding style variable naming convention instead of using camelCase style. Issue reported by checkpatch script for these variables: tagLen, tagType, networkAddr, ipAddr, macAddr

Signed-off-by: Deepak R Varma drv@mailo.com

Changes in v4:

  1. Implement "use short variable name" feedback from David.Laight@ACULAB.COM

Changes in v3: -- None

Changes in v1 [actually v2]:

  1. Improve patch description per feedback from julia.lawall@inria.fr

drivers/staging/r8188eu/core/rtw_br_ext.c | 112 +++++++++++----------- 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c index 4c5f30792a46..e509b8454e25 100644 --- a/drivers/staging/r8188eu/core/rtw_br_ext.c +++ b/drivers/staging/r8188eu/core/rtw_br_ext.c @@ -50,17 +50,17 @@ static unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type) { unsigned char *cur_ptr, *start_ptr; - unsigned short tagLen, tagType; + unsigned short tag_len, tag_type;

 start_ptr = (unsigned char *)ph->tag;
 cur_ptr = (unsigned char *)ph->tag;
 while ((cur_ptr - start_ptr) < ntohs(ph->length)) {
     /*  prevent un-alignment access */

-static void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr, - unsigned int *ipAddr) +static void __nat25_generate_ipv4_network_addr(unsigned char *addr, + unsigned int *ip_addr) { - memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); + memset(addr, 0, MAX_NETWORK_ADDR_LEN);

-static void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr, +static void __nat25_generate_pppoe_network_addr(unsigned char *addr, unsigned char *ac_mac, __be16 *sid) { - memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); + memset(addr, 0, MAX_NETWORK_ADDR_LEN);

-static void __nat25_generate_ipv6_network_addr(unsigned char *networkAddr, - unsigned int *ipAddr) +static void __nat25_generate_ipv6_network_addr(unsigned char *addr, + unsigned int *ip_addr) { - memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); + memset(addr, 0, MAX_NETWORK_ADDR_LEN);

@@ -200,40 +200,40 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char return 0; }

-static int __nat25_network_hash(unsigned char *networkAddr) +static int __nat25_network_hash(unsigned char *addr) { - if (networkAddr[0] == NAT25_IPV4) { + if (addr[0] == NAT25_IPV4) { unsigned long x;

@@ -241,7 +241,7 @@ static int __nat25_network_hash(unsigned char *networkAddr) int i;

     for (i = 0; i < MAX_NETWORK_ADDR_LEN; i++)

@@ -269,17 +269,17 @@ static void __network_hash_unlink(struct nat25_network_db_entry *ent) }

static void __nat25_db_network_insert(struct adapter *priv, - unsigned char *macAddr, unsigned char *networkAddr) + unsigned char *mac_addr, unsigned char *addr) { struct nat25_network_db_entry *db; int hash;

 spin_lock_bh(&priv->br_ext_lock);

@@ -291,8 +291,8 @@ static void __nat25_db_network_insert(struct adapter *priv, spin_unlock_bh(&priv->br_ext_lock); return; } - memcpy(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN); - memcpy(db->macAddr, macAddr, ETH_ALEN); + memcpy(db->networkAddr, addr, MAX_NETWORK_ADDR_LEN); + memcpy(db->macAddr, mac_addr, ETH_ALEN); atomic_set(&db->use_count, 1); db->ageing_timer = jiffies;

@@ -366,7 +366,7 @@ void nat25_db_expire(struct adapter *priv) int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) { unsigned short protocol; - unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; + unsigned char addr[MAX_NETWORK_ADDR_LEN]; unsigned int tmp;

 if (!skb)

@@ -395,9 +395,9 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff skb, int method) if (iph->saddr == 0) return 0; tmp = be32_to_cpu(iph->saddr); - __nat25_generate_ipv4_network_addr(networkAddr, &tmp); + __nat25_generate_ipv4_network_addr(addr, &tmp); / record source IP address and , source mac address into db */ - __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr); + __nat25_db_network_insert(priv, skb->data + ETH_ALEN, addr); return 0; default: return -1; @@ -421,8 +421,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) memcpy(arp_ptr, GET_MY_HWADDR(priv), ETH_ALEN); arp_ptr += arp->ar_hln; sender = (unsigned int *)arp_ptr; - __nat25_generate_ipv4_network_addr(networkAddr, sender); - __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr); + __nat25_generate_ipv4_network_addr(addr, sender); + __nat25_db_network_insert(priv, skb->data + ETH_ALEN, addr); return 0; default: return -1; @@ -495,9 +495,9 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff skb, int method) return -1; } } else { / session phase */ - __nat25_generate_pppoe_network_addr(networkAddr, skb->data, &ph->sid); + __nat25_generate_pppoe_network_addr(addr, skb->data, &ph->sid);

@@ -548,8 +548,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) return -1; case NAT25_INSERT: if (memcmp(&iph->saddr, "\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0", 16)) { - __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->saddr); - __nat25_db_network_insert(priv, skb->data + ETH_ALEN, networkAddr); + __nat25_generate_ipv6_network_addr(addr, (unsigned int *)&iph->saddr); + __nat25_db_network_insert(priv, skb->data + ETH_ALEN, addr);

             if (iph->nexthdr == IPPROTO_ICMPV6 &&
                     skb->len > (ETH_HLEN +  sizeof(*iph) + 4)) {

@@ -639,17 +639,17 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb) } }

-void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr) +void *scdb_findEntry(struct adapter *priv, unsigned char *ip_addr) { - unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; + unsigned char addr[MAX_NETWORK_ADDR_LEN]; struct nat25_network_db_entry *db; int hash;

-- 2.30.2

next prev parent reply other threads:[~2022-10-20 21:27 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-20 21:26 [PATCH v4 00/11] staging: r8188eu: trivial code cleanup patches Deepak R Varma **2022-10-20 21:26 [Deepak R Varma [this message]](#t)** 2022-10-20 21:27 [PATCH v4 02/11] staging: r8188eu: reformat long computation lines Deepak R Varma 2022-10-20 21:27 [[PATCH v4 03/11] staging: r8188eu: remove {} for single statement blocks](../a50460e1507621b29a7901cc4ff9501b172417db.1666299151.git.drv@mailo.com/) Deepak R Varma 2022-10-20 21:28 [PATCH v4 04/11] staging: r8188eu: use htons macro instead of __constant_htons Deepak R Varma 2022-10-20 21:29 [[PATCH v4 05/11] staging: r8188eu: correct misspelled words in comments](../00be5f2a97b0c899279bd8f9cd27634186b77b9d.1666299151.git.drv@mailo.com/) Deepak R Varma 2022-10-20 21:30 [PATCH v4 06/11] staging: r8188eu: Add space between function & macro parameters Deepak R Varma 2022-10-20 21:30 [[PATCH v4 07/11] staging: r8188eu: Associate pointer symbol with parameter name](../d946b69bfdfb44baae3a130e412ed2e217a710a7.1666299151.git.drv@mailo.com/) Deepak R Varma 2022-10-20 21:31 [PATCH v4 08/11] staging: r8188eu: replace leading spaces by tabs Deepak R Varma 2022-10-21 5:34 [Praveen Kumar](../a1429a6a-1688-c30a-4fb2-3d575ffecbf1@linux.microsoft.com/) 2022-10-20 23:31 Deepak R Varma 2022-10-20 21:31 [[PATCH v4 09/11] staging: r8188eu: Put '{" on the symbol declaration line](../375f742936493b562bd4dfba90eb75bd8ab84f8a.1666299151.git.drv@mailo.com/) Deepak R Varma 2022-10-20 21:32 [PATCH v4 10/11] staging: r8188eu: Correct missing or extra space in the statements Deepak R Varma 2022-10-20 21:32 [[PATCH v4 11/11] staging: r8188eu: Remove unused macros](../efaf637a14b6f7fdd0178e2aecf8abf17e6922f6.1666299151.git.drv@mailo.com/) Deepak R Varma 2022-10-21 5:51 Praveen Kumar 2022-10-21 5:56 [Greg KH](../Y1I0dcZqMJAzHSm2@kroah.com/) 2022-10-20 23:34 Deepak R Varma 2022-10-21 8:33 [Greg KH](../Y1JZdembzkkQPaOQ@kroah.com/) 2022-10-20 23:50 Deepak R Varma 2022-10-21 5:20 [[PATCH v4 00/11] staging: r8188eu: trivial code cleanup patches](../113aed11-de11-bf68-1ec1-1b420ff502da@gmail.com/) Philipp Hortmann 2022-10-22 8:05 Greg KH 2022-10-21 16:49 ` Deepak R Varma

Reply instructions:

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

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).