diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
commit | c0435a971e9c21ebf694b221717e7a73f12662ec (patch) | |
tree | 6daa92bd257c9376af180e7bb3649dca91589812 /target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch | |
parent | 87203c404996884334a9584fce0d8a251bf9fb43 (diff) | |
download | upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.gz upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.bz2 upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.zip |
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36663
Diffstat (limited to 'target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch new file mode 100644 index 0000000000..e802b0bf9c --- /dev/null +++ b/target/linux/generic/patches-3.10/702-phy_add_aneg_done_function.patch @@ -0,0 +1,45 @@ +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -408,9 +408,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 +@@ -795,6 +795,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 +@@ -108,6 +108,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); |