|
 |
149f89 |
From c5c7c33cb83947523e954c7410216e6b8c0dd942 Mon Sep 17 00:00:00 2001
|
|
|
149f89 |
From: Pavel Belous <pavel.s.belous@gmail.com>
|
|
|
149f89 |
Date: Mon, 30 Jan 2017 20:03:30 +0300
|
|
|
149f89 |
Subject: [PATCH 09/11] ethtool: Add support for 2500baseT/5000baseT link modes
|
|
|
149f89 |
|
|
|
149f89 |
This patch introduce ethtool support for 2500BaseT and 5000BaseT link modes
|
|
|
149f89 |
from new IEEE 802.3bz standard.
|
|
|
149f89 |
|
|
|
149f89 |
ethtool-copy.h file sync with net.
|
|
|
149f89 |
|
|
|
149f89 |
Signed-off-by: Pavel Belous <pavel.s.belous@gmail.com>
|
|
|
149f89 |
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
|
149f89 |
(cherry picked from commit 64dfc5e2f0467a4f61c066165eb42c118ca744e3)
|
|
|
149f89 |
---
|
|
|
149f89 |
ethtool-copy.h | 4 +++-
|
|
|
149f89 |
ethtool.8.in | 4 +++-
|
|
|
149f89 |
ethtool.c | 6 ++++++
|
|
|
149f89 |
3 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
149f89 |
|
|
|
149f89 |
diff --git a/ethtool-copy.h b/ethtool-copy.h
|
|
|
149f89 |
index 3d299e3..06fc04c 100644
|
|
|
149f89 |
--- a/ethtool-copy.h
|
|
|
149f89 |
+++ b/ethtool-copy.h
|
|
|
149f89 |
@@ -1382,6 +1382,8 @@ enum ethtool_link_mode_bit_indices {
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
|
|
|
149f89 |
+ ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
|
|
|
149f89 |
+ ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
|
|
|
149f89 |
|
|
|
149f89 |
|
|
|
149f89 |
/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
|
|
|
149f89 |
@@ -1391,7 +1393,7 @@ enum ethtool_link_mode_bit_indices {
|
|
|
149f89 |
*/
|
|
|
149f89 |
|
|
|
149f89 |
__ETHTOOL_LINK_MODE_LAST
|
|
|
149f89 |
- = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
|
|
|
149f89 |
+ = ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
|
|
|
149f89 |
};
|
|
|
149f89 |
|
|
|
149f89 |
#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
|
|
|
149f89 |
diff --git a/ethtool.8.in b/ethtool.8.in
|
|
|
149f89 |
index b69c5c6..eb0f551 100644
|
|
|
149f89 |
--- a/ethtool.8.in
|
|
|
149f89 |
+++ b/ethtool.8.in
|
|
|
149f89 |
@@ -578,7 +578,9 @@ lB l lB.
|
|
|
149f89 |
0x020 1000baseT Full
|
|
|
149f89 |
0x20000 1000baseKX Full
|
|
|
149f89 |
0x20000000000 1000baseX Full
|
|
|
149f89 |
-0x8000 2500baseX Full (not supported by IEEE standards)
|
|
|
149f89 |
+0x800000000000 2500baseT Full
|
|
|
149f89 |
+0x8000 2500baseX Full (not supported by IEEE standards)'
|
|
|
149f89 |
+0x1000000000000 5000baseT Full
|
|
|
149f89 |
0x1000 10000baseT Full
|
|
|
149f89 |
0x40000 10000baseKX4 Full
|
|
|
149f89 |
0x80000 10000baseKR Full
|
|
|
149f89 |
diff --git a/ethtool.c b/ethtool.c
|
|
|
149f89 |
index 5465f59..9650f54 100644
|
|
|
149f89 |
--- a/ethtool.c
|
|
|
149f89 |
+++ b/ethtool.c
|
|
|
149f89 |
@@ -529,6 +529,8 @@ static void init_global_link_mode_masks(void)
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT,
|
|
|
149f89 |
ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
|
|
|
149f89 |
+ ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
|
|
|
149f89 |
+ ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
|
|
|
149f89 |
};
|
|
|
149f89 |
static const enum ethtool_link_mode_bit_indices
|
|
|
149f89 |
additional_advertised_flags_bits[] = {
|
|
|
149f89 |
@@ -681,6 +683,10 @@ static void dump_link_caps(const char *prefix, const char *an_prefix,
|
|
|
149f89 |
"10000baseLRM/Full" },
|
|
|
149f89 |
{ 0, ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
|
|
|
149f89 |
"10000baseER/Full" },
|
|
|
149f89 |
+ { 0, ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
|
|
|
149f89 |
+ "2500baseT/Full" },
|
|
|
149f89 |
+ { 0, ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
|
|
|
149f89 |
+ "5000baseT/Full" },
|
|
|
149f89 |
};
|
|
|
149f89 |
int indent;
|
|
|
149f89 |
int did1, new_line_pend, i;
|
|
|
149f89 |
--
|
|
|
149f89 |
1.8.3.1
|
|
|
149f89 |
|