mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
c7634180fc
Refreshed all patches. Remove upstreamed: - 023-0013-crypto-crypto4xx-fix-AES-CTR-blocksize-value.patch - 023-0014-crypto-crypto4xx-fix-blocksize-for-cfb-and-ofb.patch - 023-0015-crypto-crypto4xx-block-ciphers-should-only-accept-co.patch - 950-0252-staging-bcm2835_camera-Ensure-all-buffers-are-return.patch - 950-0253-staging-bcm2835-camera-Remove-check-of-the-number-of.patch - 950-0254-staging-bcm2835-camera-Handle-empty-EOS-buffers-whil.patch - 950-0489-staging-mmal-vchiq-Replace-spinlock-protecting-conte.patch - 0021-ARM-dts-gemini-Fix-up-DNS-313-compatible-string.patch - 049-v4.20-mips-remove-superfluous-check-for-linux.patch - 100-MIPS-fix-build-on-non-linux-hosts.patch - 303-MIPS-Fix-bounds-check-virt_addr_valid.patch - 0002-usb-dwc2-use-a-longer-AHB-idle-timeout-in-dwc2_core_.patch Altered patches: - 950-0267-staging-vc04_services-Split-vchiq-mmal-into-a-module.patch - 700-net-add-qualcomm-mdio-and-phy.patch Fixes: - CVE-2019-3846 New symbol: - AX88796B_PHY Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 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
|
|
@@ -1136,6 +1136,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
|
|
@@ -560,6 +560,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);
|
|
|