2013-07-13 11:43:09

by Dragos Foianu

Subject: [PATCH] ethtool: fixed trailing statements in ethtool

Applied fixes suggested by checkpatch.pl.

Signed-off-by: Dragos Foianu <[email protected]>
---
net/core/ethtool.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index ab5fa63..78e9d92 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -279,11 +279,16 @@ static u32 __ethtool_get_flags(struct net_device *dev)
{
u32 flags = 0;

- if (dev->features & NETIF_F_LRO) flags |= ETH_FLAG_LRO;
- if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) flags |= ETH_FLAG_RXVLAN;
- if (dev->features & NETIF_F_HW_VLAN_CTAG_TX) flags |= ETH_FLAG_TXVLAN;
- if (dev->features & NETIF_F_NTUPLE) flags |= ETH_FLAG_NTUPLE;
- if (dev->features & NETIF_F_RXHASH) flags |= ETH_FLAG_RXHASH;
+ if (dev->features & NETIF_F_LRO)
+ flags |= ETH_FLAG_LRO;
+ if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
+ flags |= ETH_FLAG_RXVLAN;
+ if (dev->features & NETIF_F_HW_VLAN_CTAG_TX)
+ flags |= ETH_FLAG_TXVLAN;
+ if (dev->features & NETIF_F_NTUPLE)
+ flags |= ETH_FLAG_NTUPLE;
+ if (dev->features & NETIF_F_RXHASH)
+ flags |= ETH_FLAG_RXHASH;

return flags;
}
@@ -295,11 +300,16 @@ static int __ethtool_set_flags(struct net_device *dev, u32 data)
if (data & ~ETH_ALL_FLAGS)
return -EINVAL;

- if (data & ETH_FLAG_LRO) features |= NETIF_F_LRO;
- if (data & ETH_FLAG_RXVLAN) features |= NETIF_F_HW_VLAN_CTAG_RX;
- if (data & ETH_FLAG_TXVLAN) features |= NETIF_F_HW_VLAN_CTAG_TX;
- if (data & ETH_FLAG_NTUPLE) features |= NETIF_F_NTUPLE;
- if (data & ETH_FLAG_RXHASH) features |= NETIF_F_RXHASH;
+ if (data & ETH_FLAG_LRO)
+ features |= NETIF_F_LRO;
+ if (data & ETH_FLAG_RXVLAN)
+ features |= NETIF_F_HW_VLAN_CTAG_RX;
+ if (data & ETH_FLAG_TXVLAN)
+ features |= NETIF_F_HW_VLAN_CTAG_TX;
+ if (data & ETH_FLAG_NTUPLE)
+ features |= NETIF_F_NTUPLE;
+ if (data & ETH_FLAG_RXHASH)
+ features |= NETIF_F_RXHASH;

/* allow changing only bits set in hw_features */
changed = (features ^ dev->features) & ETH_ALL_FEATURES;
--
1.7.10.4

2013-07-15 13:54:25

by Ben Hutchings

Subject: Re: [PATCH] ethtool: fixed trailing statements in ethtool

On Sat, 2013-07-13 at 14:43 +0100, Dragos Foianu wrote:
> Applied fixes suggested by checkpatch.pl.
>
> Signed-off-by: Dragos Foianu <[email protected]>

I think that it's fine to put the conditional statement on the same line
for repetitive conversion code like this. I don't think anyone's likely
to mis-read it, which I think is the reason why checkpatch warns.

But I also won't object to this. I don't mind either way.

Ben.

> ---
> net/core/ethtool.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/net/core/ethtool.c b/net/core/ethtool.c
> index ab5fa63..78e9d92 100644
> --- a/net/core/ethtool.c
> +++ b/net/core/ethtool.c
> @@ -279,11 +279,16 @@ static u32 __ethtool_get_flags(struct net_device *dev)
> {
> u32 flags = 0;
>
> - if (dev->features & NETIF_F_LRO) flags |= ETH_FLAG_LRO;
> - if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) flags |= ETH_FLAG_RXVLAN;
> - if (dev->features & NETIF_F_HW_VLAN_CTAG_TX) flags |= ETH_FLAG_TXVLAN;
> - if (dev->features & NETIF_F_NTUPLE) flags |= ETH_FLAG_NTUPLE;
> - if (dev->features & NETIF_F_RXHASH) flags |= ETH_FLAG_RXHASH;
> + if (dev->features & NETIF_F_LRO)
> + flags |= ETH_FLAG_LRO;
> + if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
> + flags |= ETH_FLAG_RXVLAN;
> + if (dev->features & NETIF_F_HW_VLAN_CTAG_TX)
> + flags |= ETH_FLAG_TXVLAN;
> + if (dev->features & NETIF_F_NTUPLE)
> + flags |= ETH_FLAG_NTUPLE;
> + if (dev->features & NETIF_F_RXHASH)
> + flags |= ETH_FLAG_RXHASH;
>
> return flags;
> }
> @@ -295,11 +300,16 @@ static int __ethtool_set_flags(struct net_device *dev, u32 data)
> if (data & ~ETH_ALL_FLAGS)
> return -EINVAL;
>
> - if (data & ETH_FLAG_LRO) features |= NETIF_F_LRO;
> - if (data & ETH_FLAG_RXVLAN) features |= NETIF_F_HW_VLAN_CTAG_RX;
> - if (data & ETH_FLAG_TXVLAN) features |= NETIF_F_HW_VLAN_CTAG_TX;
> - if (data & ETH_FLAG_NTUPLE) features |= NETIF_F_NTUPLE;
> - if (data & ETH_FLAG_RXHASH) features |= NETIF_F_RXHASH;
> + if (data & ETH_FLAG_LRO)
> + features |= NETIF_F_LRO;
> + if (data & ETH_FLAG_RXVLAN)
> + features |= NETIF_F_HW_VLAN_CTAG_RX;
> + if (data & ETH_FLAG_TXVLAN)
> + features |= NETIF_F_HW_VLAN_CTAG_TX;
> + if (data & ETH_FLAG_NTUPLE)
> + features |= NETIF_F_NTUPLE;
> + if (data & ETH_FLAG_RXHASH)
> + features |= NETIF_F_RXHASH;
>
> /* allow changing only bits set in hw_features */
> changed = (features ^ dev->features) & ETH_ALL_FEATURES;

--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

2013-07-16 19:15:28

by David Miller

Subject: Re: [PATCH] ethtool: fixed trailing statements in ethtool

From: Dragos Foianu <[email protected]>
Date: Sat, 13 Jul 2013 14:43:00 +0100

> Applied fixes suggested by checkpatch.pl.
>
> Signed-off-by: Dragos Foianu <[email protected]>

Applied, but only so that life is easier for the next person who
makes changes to this file and wants to validate things with
checkpatch.