diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-01-19 23:09:59 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-01-19 23:10:00 +0300 |
| commit | 3d4375c2a9d33cbc440c72afb4782d4976713a98 (patch) | |
| tree | 9adb894d45a25ecaaae5e431be7fda15b6f8a2ec /include | |
| parent | 456083e7f1cfa6a9133f06c48ff04f4c2956dbac (diff) | |
| parent | 7a3d3279a566813b453f9ac4cf01e6f48e4e40e4 (diff) | |
| download | linux-3d4375c2a9d33cbc440c72afb4782d4976713a98.tar.xz | |
Merge branch 'net-thunderbolt-various-improvements'
Mika Westerberg says:
====================
net: thunderbolt: Various improvements
This series improves the Thunderbolt networking driver so that it should
work with the bonding driver.
The discussion that started this patch series can be read below:
https://lore.kernel.org/netdev/CAFJzfF9N4Hak23sc-zh0jMobbkjK7rg4odhic1DQ1cC+=MoQoA@mail.gmail.com/
v2: https://lore.kernel.org/20260109122606.3586895-1-mika.westerberg@linux.intel.com
v1: https://lore.kernel.org/20251127131521.2580237-1-mika.westerberg@linux.intel.com
====================
Link: https://patch.msgid.link/20260115115646.328898-1-mika.westerberg@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phylink.h | 7 | ||||
| -rw-r--r-- | include/uapi/linux/ethtool.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 38363e566ac3..20996f5778d1 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -90,9 +90,10 @@ enum { MAC_40000FD = BIT(13), MAC_50000FD = BIT(14), MAC_56000FD = BIT(15), - MAC_100000FD = BIT(16), - MAC_200000FD = BIT(17), - MAC_400000FD = BIT(18), + MAC_80000FD = BIT(16), + MAC_100000FD = BIT(17), + MAC_200000FD = BIT(18), + MAC_400000FD = BIT(19), }; static inline bool phylink_autoneg_inband(unsigned int mode) diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h index ce9aeb65a8e1..b74b80508553 100644 --- a/include/uapi/linux/ethtool.h +++ b/include/uapi/linux/ethtool.h @@ -2203,6 +2203,7 @@ enum ethtool_link_mode_bit_indices { #define SPEED_40000 40000 #define SPEED_50000 50000 #define SPEED_56000 56000 +#define SPEED_80000 80000 #define SPEED_100000 100000 #define SPEED_200000 200000 #define SPEED_400000 400000 |