[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1371493254.2086.64.camel@bwh-desktop.uk.level5networks.com>
Date: Mon, 17 Jun 2013 19:20:54 +0100
From: Ben Hutchings <bhutchings@...arflare.com>
To: Fernando Luis Vázquez Cao
<fernando_b1@....ntt.co.jp>
CC: Patrick McHardy <kaber@...sh.net>,
"David S. Miller" <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: Re: [PATCH] vlan: restore ethtool ABI to control VLAN hardware
acceleration
On Mon, 2013-06-17 at 11:28 +0900, Fernando Luis Vázquez Cao wrote:
> As part of the push to add 802.1ad server provider tagging support to the
> kernel the VLAN features flags were renamed. Unfortunately the kernel name
> for the VLAN hardware acceleration features that the kernel shows user space
> was included in the rename, which broke ethtool (txvlan and rxvlan options
> do not work).
I expected something like that and said this was an ABI change, but
apparently my objection wasn't sufficient.
> This patch restores the original names, i.e. the original ABI.
> If we wanted to make clear to users that we are refering to CTAGs we can
> always change ethtool's short_name and long_name for these features (for
> example something along the lines of txvlan -> txvlan-ctag, tx-vlan-offload ->
> tx-vlan-ctag-offload).
>
> Cc: Patrick McHardy <kaber@...sh.net>
> Cc: David S. Miller <davem@...emloft.net>
> Cc: netdev@...r.kernel.org
> Signed-off-by: Fernando Luis Vazquez Cao <fernando@....ntt.co.jp>
Reviewed-by: Ben Hutchings <bhutchings@...arflare.com>
Ben.
> ---
>
> diff -urNp linux-3.10-rc5-orig/net/core/ethtool.c linux-3.10-rc5/net/core/ethtool.c
> --- linux-3.10-rc5-orig/net/core/ethtool.c 2013-06-09 09:41:04.000000000 +0900
> +++ linux-3.10-rc5/net/core/ethtool.c 2013-06-14 23:08:22.330454778 +0900
> @@ -60,10 +60,10 @@ static const char netdev_features_string
> [NETIF_F_IPV6_CSUM_BIT] = "tx-checksum-ipv6",
> [NETIF_F_HIGHDMA_BIT] = "highdma",
> [NETIF_F_FRAGLIST_BIT] = "tx-scatter-gather-fraglist",
> - [NETIF_F_HW_VLAN_CTAG_TX_BIT] = "tx-vlan-ctag-hw-insert",
> + [NETIF_F_HW_VLAN_CTAG_TX_BIT] = "tx-vlan-hw-insert",
>
> - [NETIF_F_HW_VLAN_CTAG_RX_BIT] = "rx-vlan-ctag-hw-parse",
> - [NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-ctag-filter",
> + [NETIF_F_HW_VLAN_CTAG_RX_BIT] = "rx-vlan-hw-parse",
> + [NETIF_F_HW_VLAN_CTAG_FILTER_BIT] = "rx-vlan-filter",
> [NETIF_F_HW_VLAN_STAG_TX_BIT] = "tx-vlan-stag-hw-insert",
> [NETIF_F_HW_VLAN_STAG_RX_BIT] = "rx-vlan-stag-hw-parse",
> [NETIF_F_HW_VLAN_STAG_FILTER_BIT] = "rx-vlan-stag-filter",
>
--
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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists