mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
e31d158c4d
Refreshed all patches. Remove upstreamed: - 0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch Fixes: - CVE-2020-8648 (potentially) - CVE-2020-8647 - CVE-2020-8649 Compile-tested on: cns3xxx, octeontx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Subject: generic: add detach callback to struct phy_driver
|
|
|
|
lede-commit: fe61fc2d7d0b3fb348b502f68f98243b3ddf5867
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
drivers/net/phy/phy_device.c | 3 +++
|
|
include/linux/phy.h | 6 ++++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -1110,6 +1110,9 @@ void phy_detach(struct phy_device *phyde
|
|
struct module *ndev_owner = dev->dev.parent->driver->owner;
|
|
struct mii_bus *bus;
|
|
|
|
+ if (phydev->drv && phydev->drv->detach)
|
|
+ phydev->drv->detach(phydev);
|
|
+
|
|
if (phydev->sysfs_links) {
|
|
sysfs_remove_link(&dev->dev.kobj, "phydev");
|
|
sysfs_remove_link(&phydev->mdio.dev.kobj, "attached_dev");
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -561,6 +561,12 @@ struct phy_driver {
|
|
*/
|
|
int (*did_interrupt)(struct phy_device *phydev);
|
|
|
|
+ /*
|
|
+ * Called before an ethernet device is detached
|
|
+ * from the PHY.
|
|
+ */
|
|
+ void (*detach)(struct phy_device *phydev);
|
|
+
|
|
/* Clears up any memory if needed */
|
|
void (*remove)(struct phy_device *phydev);
|
|
|