3c3825436e
Refreshed all patches. Remove upstreamed: - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
27 lines
842 B
Diff
27 lines
842 B
Diff
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -557,6 +557,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
|
|
@@ -1581,6 +1581,9 @@ int genphy_update_link(struct phy_device
|
|
{
|
|
int status;
|
|
|
|
+ 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.
|