diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-25 19:19:01 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-25 19:19:01 +0200 |
commit | c6847d3f5be31fd644d6a41de147b4604852966e (patch) | |
tree | 192129bb2c530fe17fa7ab2339cff505d54f5029 /target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch | |
parent | d0b360fab8b74eb5ae912e4841ef0403dbabb981 (diff) | |
parent | 67e2da6a84f50c0b0e43f4d4fb9eae91671e81ad (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch')
-rw-r--r-- | target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch b/target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch new file mode 100644 index 000000000..43ca7ce9b --- /dev/null +++ b/target/mips/mikrotik-rb4xx/patches/3.14.43/0014-phy-add-detach-callback-to-struct-phy_driver.patch @@ -0,0 +1,46 @@ +From 76e9965a69ff97c3ca973ca54f145a96023bdeca Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Wed, 14 May 2014 03:24:00 +0200 +Subject: [PATCH] phy: add detach callback to struct phy_driver + +This is used by ar8216 driver. +--- + drivers/net/phy/phy_device.c | 4 ++++ + include/linux/phy.h | 6 ++++++ + 2 files changed, 10 insertions(+) + +diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c +index 3653754..b35ece2 100644 +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -662,6 +662,10 @@ EXPORT_SYMBOL(phy_attach); + void phy_detach(struct phy_device *phydev) + { + int i; ++ ++ if (phydev->drv && phydev->drv->detach) ++ phydev->drv->detach(phydev); ++ + phydev->attached_dev->phydev = NULL; + phydev->attached_dev = NULL; + phy_suspend(phydev); +diff --git a/include/linux/phy.h b/include/linux/phy.h +index 9ab0d79..f1441b4 100644 +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -432,6 +432,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); + +-- +1.8.5.3 + |