aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-10-23 12:21:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-10-23 12:21:34 +0000
commit648f1d01710c2e9d5bb3e296d9553120e5bbe51e (patch)
tree413eb23081ae9b34b54a6ee479e5a2bf0085877d /target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch
parent35c7b0ba8a06d128adf45ca58377299e988d4e84 (diff)
downloadupstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.tar.gz
upstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.tar.bz2
upstream-648f1d01710c2e9d5bb3e296d9553120e5bbe51e.zip
[generic]: linux 3.6 support (work in progress)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33897 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch')
-rw-r--r--target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch
new file mode 100644
index 0000000000..0649afb10a
--- /dev/null
+++ b/target/linux/generic/patches-3.6/702-phy_add_aneg_done_function.patch
@@ -0,0 +1,45 @@
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -393,9 +393,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
+@@ -705,6 +705,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);