diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:05 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:05 +0000 |
commit | c19a05ddc769a8b14837218fea04fe8b5c887eee (patch) | |
tree | d0285c3b8b16f40ed39ca88a77e257f6443ecb57 /target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch | |
parent | 80a4ffa1e2bc5f3ef893251babb2371c502f04ad (diff) | |
download | master-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.gz master-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.bz2 master-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.zip |
kernel: reorganize 2.6.39 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26691 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch new file mode 100644 index 0000000000..776b768431 --- /dev/null +++ b/target/linux/generic/patches-2.6.39/702-phy_add_aneg_done_function.patch @@ -0,0 +1,45 @@ +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -386,9 +386,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); |