diff options
author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
commit | 4398ecd73dcf8554c0e495de082e4677440c1d5c (patch) | |
tree | e24faee648bd7fe02dcdb4a9f916f88324797735 /target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch | |
parent | adb7aa14be1321e4ee57b2564edeb558d7eedcda (diff) | |
download | master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.gz master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.tar.bz2 master-187ad058-4398ecd73dcf8554c0e495de082e4677440c1d5c.zip |
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45375 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch')
-rw-r--r-- | target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch b/target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch deleted file mode 100644 index 8e25f8c1bb..0000000000 --- a/target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Balakumaran Kannan <kumaran.4353@gmail.com> -Date: Thu, 24 Apr 2014 08:22:47 +0530 -Subject: [PATCH] net phy: Check for aneg completion before setting state to - PHY_RUNNING - -phy_state_machine should check whether auto-negotiatin is completed -before changing phydev->state from PHY_NOLINK to PHY_RUNNING. If -auto-negotiation is not completed phydev->state should be set to -PHY_AN. - -Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com> -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - ---- a/drivers/net/phy/phy.c -+++ b/drivers/net/phy/phy.c -@@ -744,6 +744,17 @@ void phy_state_machine(struct work_struc - break; - - if (phydev->link) { -+ if (AUTONEG_ENABLE == phydev->autoneg) { -+ err = phy_aneg_done(phydev); -+ if (err < 0) -+ break; -+ -+ if (!err) { -+ phydev->state = PHY_AN; -+ phydev->link_timeout = PHY_AN_TIMEOUT; -+ break; -+ } -+ } - phydev->state = PHY_RUNNING; - netif_carrier_on(phydev->attached_dev); - phydev->adjust_link(phydev->attached_dev); |