diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-29 14:35:23 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-29 14:35:23 +0000 |
commit | 93d46eff0251eed425d040eb57ab884881cc7bbf (patch) | |
tree | f0db464d80e07fbb18c9f99ac73f45aadf7e22a6 /target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch | |
parent | 324a2cedd382a542391a01b2092686b0befbbf6a (diff) | |
download | upstream-93d46eff0251eed425d040eb57ab884881cc7bbf.tar.gz upstream-93d46eff0251eed425d040eb57ab884881cc7bbf.tar.bz2 upstream-93d46eff0251eed425d040eb57ab884881cc7bbf.zip |
linux/generic: add kernel 2.6.36 preliminary support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22832 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch b/target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch new file mode 100644 index 0000000000..f64ecea245 --- /dev/null +++ b/target/linux/generic/patches-2.6.36/601-phy-add-aneg-done-function.patch @@ -0,0 +1,45 @@ +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -384,9 +384,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 +@@ -710,6 +710,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); |