diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-21 15:18:58 +0000 |
commit | 50610aa86998ad5c6af1b77b82a18dbbf18af2f5 (patch) | |
tree | 257882d0984cba5884defdecf417ce8c09714309 /target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch | |
parent | 2e5d3d2795663d7c3cc88356b307e05f833f4e16 (diff) | |
download | upstream-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.tar.gz upstream-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.tar.bz2 upstream-50610aa86998ad5c6af1b77b82a18dbbf18af2f5.zip |
linux/2.6.31: R.I.P.
SVN-Revision: 31412
Diffstat (limited to 'target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch b/target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch deleted file mode 100644 index 7ab076b4af..0000000000 --- a/target/linux/generic/patches-2.6.31/601-phy-add-aneg-done-function.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -379,9 +379,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 -@@ -681,6 +681,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 -@@ -107,6 +107,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); |