diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:21 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:31:21 +0000 |
commit | bb7cacb10f3e571e0955e1926c0e84ab3fec47e0 (patch) | |
tree | 9f52b71698a01a09923ca445e48566dcb47b2f54 /target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch | |
parent | c19a05ddc769a8b14837218fea04fe8b5c887eee (diff) | |
download | master-187ad058-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.tar.gz master-187ad058-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.tar.bz2 master-187ad058-bb7cacb10f3e571e0955e1926c0e84ab3fec47e0.zip |
kernel: reorganize 2.6.37 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26692 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch b/target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch deleted file mode 100644 index f37baad729..0000000000 --- a/target/linux/generic/patches-2.6.37/601-phy-add-aneg-done-function.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 -@@ -715,6 +715,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); |