| Message ID | 20221024152855.D0D6E604C3@lion.mk-sys.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1b7d16496cc8eae7857746f04c845282f27ea7a7 |
| Delegated to: | Michal Kubecek |
| Headers | show |
| Series | [ethtool] add 10baseT1L mode to link mode tables | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to ethtool/ethtool.git (master) by Michal Kubecek <mkubecek@suse.cz>: On Mon, 24 Oct 2022 17:28:55 +0200 (CEST) you wrote: > Add recently added 10baseT1L/Full link mode to man page and ioctl and > fallback code paths. > > Signed-off-by: Michal Kubecek <mkubecek@suse.cz> > --- > ethtool.8.in | 1 + > ethtool.c | 3 +++ > netlink/settings.c | 1 + > 3 files changed, 5 insertions(+) Here is the summary with links: - [ethtool] add 10baseT1L mode to link mode tables https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/commit/?id=1b7d16496cc8 You are awesome, thank you!
diff --git a/ethtool.8.in b/ethtool.8.in index 1c0e2346f3a1..dee39ddb434a 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -776,6 +776,7 @@ nokeep; lB l lB. 0x001 10baseT Half 0x002 10baseT Full +0x100000000000000000000000 10baseT1L Full 0x004 100baseT Half 0x008 100baseT Full 0x80000000000000000 100baseT1 Full diff --git a/ethtool.c b/ethtool.c index 7b400da32c6f..5d4930252c9b 100644 --- a/ethtool.c +++ b/ethtool.c @@ -475,6 +475,7 @@ static void init_global_link_mode_masks(void) ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, ETHTOOL_LINK_MODE_100baseFX_Half_BIT, ETHTOOL_LINK_MODE_100baseFX_Full_BIT, + ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, }; static const enum ethtool_link_mode_bit_indices additional_advertised_flags_bits[] = { @@ -715,6 +716,8 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "100baseFX/Half" }, { 1, ETHTOOL_LINK_MODE_100baseFX_Full_BIT, "100baseFX/Full" }, + { 0, ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, + "10baseT1L/Full" }, }; int indent; int did1, new_line_pend; diff --git a/netlink/settings.c b/netlink/settings.c index dda4ac9bcf35..ea86e365383b 100644 --- a/netlink/settings.c +++ b/netlink/settings.c @@ -164,6 +164,7 @@ static const struct link_mode_info link_modes[] = { [ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT] = __REAL(400000), [ETHTOOL_LINK_MODE_100baseFX_Half_BIT] = __HALF_DUPLEX(100), [ETHTOOL_LINK_MODE_100baseFX_Full_BIT] = __REAL(100), + [ETHTOOL_LINK_MODE_10baseT1L_Full_BIT] = __REAL(10), }; const unsigned int link_modes_count = ARRAY_SIZE(link_modes);
Add recently added 10baseT1L/Full link mode to man page and ioctl and fallback code paths. Signed-off-by: Michal Kubecek <mkubecek@suse.cz> --- ethtool.8.in | 1 + ethtool.c | 3 +++ netlink/settings.c | 1 + 3 files changed, 5 insertions(+)