diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-08-13 17:16:11 -0700 |
|---|---|---|
| committer | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-08-13 17:16:11 -0700 |
| commit | e070ca371f2b6ccba35db83d0ca8c2de6255475d (patch) | |
| tree | 7b8814cf8b7bd2767af3c3080b20c9b9c4a2b70f /include/linux | |
| parent | 043b8413e8c0c0ffbf8be268eb73716e05a96064 (diff) | |
| parent | 65b27995a4ab8fc51b4adc6b4dcdca20f7a595bb (diff) | |
| download | cachepc-linux-e070ca371f2b6ccba35db83d0ca8c2de6255475d.tar.gz cachepc-linux-e070ca371f2b6ccba35db83d0ca8c2de6255475d.zip | |
Merge branch 'net-phy-let-phy_speed_down-up-support-speeds-1Gbps'
Heiner says:
====================
So far phy_speed_down/up can be used up to 1Gbps only. Remove this
restriction and add needed helpers to phy-core.c
v2:
- remove unused parameter in patch 1
- rename __phy_speed_down to phy_speed_down_core in patch 2
====================
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phy.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 781f4810ceba..5ac7d21375ac 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -403,6 +403,8 @@ struct phy_device { __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising); __ETHTOOL_DECLARE_LINK_MODE_MASK(lp_advertising); + /* used with phy_speed_down */ + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv_old); /* Energy efficient ethernet modes which should be prohibited */ u32 eee_broken_modes; @@ -665,6 +667,7 @@ size_t phy_speeds(unsigned int *speeds, size_t size, unsigned long *mask); void of_set_phy_supported(struct phy_device *phydev); void of_set_phy_eee_broken(struct phy_device *phydev); +int phy_speed_down_core(struct phy_device *phydev); /** * phy_is_started - Convenience function to check whether PHY is started |