1c16b574c4
Backport the phy/phylink/sfp patches currently queued in netdev or in mainline necessary to support GPON popular modules, specifically to support Huawei and Nokia GPON modules. Signed-off-by: Russell King <linux@armlinux.org.uk> [jonas.gorski: include kernel version in file names, refresh patches] Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 09d7d8395ec61fba4392b35baa6f71c4e36489df Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 8 Nov 2019 15:18:02 +0000
|
|
Subject: [PATCH 637/660] net: phylink: update to use phy_support_asym_pause()
|
|
|
|
Use phy_support_asym_pause() rather than open-coding it.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/phylink.c | 17 +++++++----------
|
|
1 file changed, 7 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -678,12 +678,6 @@ static int phylink_bringup_phy(struct ph
|
|
u32 advertising;
|
|
int ret;
|
|
|
|
- memset(&config, 0, sizeof(config));
|
|
- ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported);
|
|
- ethtool_convert_legacy_u32_to_link_mode(config.advertising,
|
|
- phy->advertising);
|
|
- config.interface = pl->link_config.interface;
|
|
-
|
|
/*
|
|
* This is the new way of dealing with flow control for PHYs,
|
|
* as described by Timur Tabi in commit 529ed1275263 ("net: phy:
|
|
@@ -691,10 +685,13 @@ static int phylink_bringup_phy(struct ph
|
|
* using our validate call to the MAC, we rely upon the MAC
|
|
* clearing the bits from both supported and advertising fields.
|
|
*/
|
|
- if (phylink_test(supported, Pause))
|
|
- phylink_set(config.advertising, Pause);
|
|
- if (phylink_test(supported, Asym_Pause))
|
|
- phylink_set(config.advertising, Asym_Pause);
|
|
+ phy_support_asym_pause(phy);
|
|
+
|
|
+ memset(&config, 0, sizeof(config));
|
|
+ ethtool_convert_legacy_u32_to_link_mode(supported, phy->supported);
|
|
+ ethtool_convert_legacy_u32_to_link_mode(config.advertising,
|
|
+ phy->advertising);
|
|
+ config.interface = pl->link_config.interface;
|
|
|
|
ret = phylink_validate(pl, supported, &config);
|
|
if (ret)
|