File ethtool-Add-missing-Advertised-speeds.patch of Package ethtool.1170
From: Eyal Grossman <eyalgr@mellanox.com>
Date: Sun, 25 Jan 2015 15:51:20 +0200
Subject: ethtool: Add missing Advertised speeds
Patch-mainline: v4.0
Git-commit: b55a631d5ace86517508151dda491ffd40ad7e4b
References: bsc#927309 bsc#945710
Added the following missing advertised speed modes:
- ADVERTISED_10000baseT_Full
- ADVERTISED_56000baseKR4_Full
- ADVERTISED_56000baseCR4_Full
- ADVERTISED_56000baseSR4_Full
- ADVERTISED_56000baseLR4_Full
- ADVERTISED_10000baseKX4_Full
In order to reduce code duplication we added a macro to
ALL_ADVERTISED_FLAGS in line 88 ALL_ADVERTISED_MODES,
in addition the changed we made added speed that were
missing from ALL_ADVERTISED_MODES
(e.g. ADVERTISED_10000baseKX4_Full).
Signed-off-by: Eyal Grossman <eyalgr@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
[bwh: Dropped two slightly related changes from this, that I didn't like]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
ethtool.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index b06dfa3139a0..1a07ba7bc39a 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -53,7 +53,9 @@
ADVERTISED_100baseT_Full | \
ADVERTISED_1000baseT_Half | \
ADVERTISED_1000baseT_Full | \
+ ADVERTISED_1000baseKX_Full| \
ADVERTISED_2500baseX_Full | \
+ ADVERTISED_10000baseT_Full | \
ADVERTISED_10000baseKX4_Full | \
ADVERTISED_10000baseKR_Full | \
ADVERTISED_10000baseR_FEC | \
@@ -62,36 +64,23 @@
ADVERTISED_40000baseKR4_Full | \
ADVERTISED_40000baseCR4_Full | \
ADVERTISED_40000baseSR4_Full | \
- ADVERTISED_40000baseLR4_Full)
+ ADVERTISED_40000baseLR4_Full | \
+ ADVERTISED_56000baseKR4_Full | \
+ ADVERTISED_56000baseCR4_Full | \
+ ADVERTISED_56000baseSR4_Full | \
+ ADVERTISED_56000baseLR4_Full)
#define ALL_ADVERTISED_FLAGS \
- (ADVERTISED_10baseT_Half | \
- ADVERTISED_10baseT_Full | \
- ADVERTISED_100baseT_Half | \
- ADVERTISED_100baseT_Full | \
- ADVERTISED_1000baseT_Half | \
- ADVERTISED_1000baseT_Full | \
- ADVERTISED_Autoneg | \
+ (ADVERTISED_Autoneg | \
ADVERTISED_TP | \
ADVERTISED_AUI | \
ADVERTISED_MII | \
ADVERTISED_FIBRE | \
ADVERTISED_BNC | \
- ADVERTISED_10000baseT_Full | \
ADVERTISED_Pause | \
ADVERTISED_Asym_Pause | \
- ADVERTISED_2500baseX_Full | \
ADVERTISED_Backplane | \
- ADVERTISED_1000baseKX_Full | \
- ADVERTISED_10000baseKX4_Full | \
- ADVERTISED_10000baseKR_Full | \
- ADVERTISED_10000baseR_FEC | \
- ADVERTISED_20000baseMLD2_Full | \
- ADVERTISED_20000baseKR2_Full | \
- ADVERTISED_40000baseKR4_Full | \
- ADVERTISED_40000baseCR4_Full | \
- ADVERTISED_40000baseSR4_Full | \
- ADVERTISED_40000baseLR4_Full)
+ ALL_ADVERTISED_MODES)
#ifndef HAVE_NETIF_MSG
enum {
@@ -530,6 +519,10 @@ dump_link_caps(const char *prefix, const char *an_prefix, u32 mask,
{ 0, ADVERTISED_40000baseCR4_Full, "40000baseCR4/Full" },
{ 0, ADVERTISED_40000baseSR4_Full, "40000baseSR4/Full" },
{ 0, ADVERTISED_40000baseLR4_Full, "40000baseLR4/Full" },
+ { 0, ADVERTISED_56000baseKR4_Full, "56000baseKR4/Full" },
+ { 0, ADVERTISED_56000baseCR4_Full, "56000baseCR4/Full" },
+ { 0, ADVERTISED_56000baseSR4_Full, "56000baseSR4/Full" },
+ { 0, ADVERTISED_56000baseLR4_Full, "56000baseLR4/Full" },
};
int indent;
int did1, new_line_pend, i;
--
2.5.1
