5ecc0cfd6f
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648, CVE-2020-8649 and CVE-2020-8647. Removed upstreamed: generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch ipq806x: 701-stmmac-fix-notifier-registration.patch lantiq: 002-pinctrl-falcon-fix-syntax-error.patch octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617 Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>
27 lines
868 B
Diff
27 lines
868 B
Diff
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -524,6 +524,12 @@ struct phy_driver {
|
|
/* Determines the negotiated speed and duplex */
|
|
int (*read_status)(struct phy_device *phydev);
|
|
|
|
+ /*
|
|
+ * Update the value in phydev->link to reflect the
|
|
+ * current link value
|
|
+ */
|
|
+ int (*update_link)(struct phy_device *phydev);
|
|
+
|
|
/* Clears any pending interrupts */
|
|
int (*ack_interrupt)(struct phy_device *phydev);
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -1827,6 +1827,9 @@ int genphy_update_link(struct phy_device
|
|
if (bmcr & BMCR_ANRESTART)
|
|
goto done;
|
|
|
|
+ if (phydev->drv && phydev->drv->update_link)
|
|
+ return phydev->drv->update_link(phydev);
|
|
+
|
|
/* The link state is latched low so that momentary link
|
|
* drops can be detected. Do not double-read the status
|
|
* in polling mode to detect such short link drops.
|