2015-04-30 00:01:32

by Vishwanath Pai

Subject: [PATCH net] net/bonding: Fix code style issues in a previous commit

This fixes a few coding style issues in my previous patch:
commit e913fb279c56
("net: Fix Kernel Panic in bonding driver debugfs file: rlb_hash_table")

Signed-off-by: Vishwanath Pai <[email protected]>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d5fe5d5..ab3eeb1 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4543,8 +4543,8 @@ unsigned int bond_get_num_tx_queues(void)
*/
int bond_create(struct net *net, const char *name)
{
- struct net_device *bond_dev;
struct bonding *bond;
+ struct net_device *bond_dev;
struct alb_bond_info *bond_info;
int res;

@@ -4559,8 +4559,7 @@ int bond_create(struct net *net, const char *name)
return -ENOMEM;
}

- /*
- * Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.
+ /* Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.
* It is set to 0 by default which is wrong.
*/
bond = netdev_priv(bond_dev);

2015-04-30 09:16:10

by Nikolay Aleksandrov

Subject: Re: [PATCH net] net/bonding: Fix code style issues in a previous commit

On 04/30/2015 02:01 AM, Pai wrote:
> This fixes a few coding style issues in my previous patch:
> commit e913fb279c56
> ("net: Fix Kernel Panic in bonding driver debugfs file: rlb_hash_table")
>
> Signed-off-by: Vishwanath Pai <[email protected]>
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index d5fe5d5..ab3eeb1 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -4543,8 +4543,8 @@ unsigned int bond_get_num_tx_queues(void)
> */
> int bond_create(struct net *net, const char *name)
> {
> - struct net_device *bond_dev;
> struct bonding *bond;
> + struct net_device *bond_dev;
> struct alb_bond_info *bond_info;
> int res;
>
> @@ -4559,8 +4559,7 @@ int bond_create(struct net *net, const char *name)
> return -ENOMEM;
> }
>
> - /*
> - * Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.
> + /* Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.
> * It is set to 0 by default which is wrong.
> */
> bond = netdev_priv(bond_dev);
>

Hi,
Thanks for following up on my comments, but I think Dave usually prefers
such cosmetic changes via net-next, of course that's for him to say. For
the local variable arrangement I meant longest to shortest as in reverse
pyramid:
struct alb_bond_info *bond_info;
struct net_device *bond_dev;
struct bonding *bond;
int res;

Cheers,
Nik