diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:09 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:09 +0000 |
commit | de4c4d35e17830170dba6aa1b3b025d93a7b3302 (patch) | |
tree | c57b3c28c8453826a6abcef3f83b80d72f732253 /target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch | |
parent | cead4b47abdebcb8506451b4a3e30028982161a1 (diff) | |
download | upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.gz upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.bz2 upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.zip |
linux/3.1: R.I.P.
SVN-Revision: 31891
Diffstat (limited to 'target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch')
-rw-r--r-- | target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch deleted file mode 100644 index 88ef9b5ca6..0000000000 --- a/target/linux/generic/patches-3.1/702-phy_add_aneg_done_function.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -388,9 +388,18 @@ struct phy_driver { - */ - int (*config_aneg)(struct phy_device *phydev); - -+ /* Determine if autonegotiation is done */ -+ int (*aneg_done)(struct phy_device *phydev); -+ - /* 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 -@@ -719,6 +719,9 @@ int genphy_update_link(struct phy_device - { - int status; - -+ if (phydev->drv->update_link) -+ return phydev->drv->update_link(phydev); -+ - /* Do a fake read */ - status = phy_read(phydev, MII_BMSR); - ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -106,6 +106,9 @@ static inline int phy_aneg_done(struct p - { - int retval; - -+ if (phydev->drv->aneg_done) -+ return phydev->drv->aneg_done(phydev); -+ - retval = phy_read(phydev, MII_BMSR); - - return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); |