[PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

[PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

[Franco Fichtner]

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]

Hi all,

I found this while skimming through recent net-next patches.
I'm not quite sure if the padding in this struct is correct now.


Franco

[-- Attachment #2: 0001-ethtool-bring-back-missing-comma-in-netdev_features_.patch --]
[-- Type: text/x-patch, Size: 990 bytes --]

>From c62ca7bb87baad78e285dc0e698e792051d8fa87 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@lastsummer.de>
Date: Wed, 11 May 2011 09:49:08 +0200
Subject: [PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

The issue was introduced in commit eed2a12f1ed9aabf.

Signed-off-by: Franco Fichtner <franco@lastsummer.de>
---
 net/core/ethtool.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index b6f4058..b8c2b10 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -361,7 +361,7 @@ static const char netdev_features_strings[ETHTOOL_DEV_FEATURE_WORDS * 32][ETH_GS
 	/* NETIF_F_NTUPLE */          "rx-ntuple-filter",
 	/* NETIF_F_RXHASH */          "rx-hashing",
 	/* NETIF_F_RXCSUM */          "rx-checksum",
-	/* NETIF_F_NOCACHE_COPY */    "tx-nocache-copy"
+	/* NETIF_F_NOCACHE_COPY */    "tx-nocache-copy",
 	/* NETIF_F_LOOPBACK */        "loopback",
 };
 
-- 
1.7.3.2.493.g0b0cd

Re: [PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

[Michał Mirosław]

2011/5/12 Franco Fichtner <franco@lastsummer.de>:
> I found this while skimming through recent net-next patches.
> I'm not quite sure if the padding in this struct is correct now.

Nice catch. But please send the patch inline instead of as an attachment.

Best Regards,
Michał Mirosław

Re: [PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

[Franco Fichtner]

On 12/05/11 10:55, Michał Mirosław wrote:
> 2011/5/12 Franco Fichtner <franco@lastsummer.de>:
>> I found this while skimming through recent net-next patches.
>> I'm not quite sure if the padding in this struct is correct now.
> Nice catch. But please send the patch inline instead of as an attachment.

Thanks, but I have a short question. Are the empty strings in
this struct really needed?

        /* NETIF_F_TSO6 */            "tx-tcp6-segmentation",
        /* NETIF_F_FSO */             "tx-fcoe-segmentation",
        "",
        "",

        /* NETIF_F_FCOE_CRC */        "tx-checksum-fcoe-crc",

They seem to have caused this mess in the first place and I would
think they could be removed entirely.

I will resend the patch later today as inline. Sorry about that.


Franco

Re: [PATCH net-next] ethtool: bring back missing comma in netdev_features_strings

[Michał Mirosław]

W dniu 12 maja 2011 11:13 użytkownik Franco Fichtner
<franco@lastsummer.de> napisał:
> On 12/05/11 10:55, Michał Mirosław wrote:
>> 2011/5/12 Franco Fichtner <franco@lastsummer.de>:
>>> I found this while skimming through recent net-next patches.
>>> I'm not quite sure if the padding in this struct is correct now.
>> Nice catch. But please send the patch inline instead of as an attachment.
> Thanks, but I have a short question. Are the empty strings in
> this struct really needed?
>
>        /* NETIF_F_TSO6 */            "tx-tcp6-segmentation",
>        /* NETIF_F_FSO */             "tx-fcoe-segmentation",
>        "",
>        "",
>
>        /* NETIF_F_FCOE_CRC */        "tx-checksum-fcoe-crc",
>
> They seem to have caused this mess in the first place and I would
> think they could be removed entirely.

Mahesh Bandewar tried to do some cleanup in how feature bits are
defined using an enum, but it wasn't completed. If that cleanup was
completed, this array could be initialized using C99 style:

  [NETIF_F_TSO6_BIT] = "tx-tcp6-segmentation",

(This has more advantages than pure aesthetics.) For now those empty
strings have to stay, as the array positions are relevant.

Best Regards,
Michał Mirosław