From d0974324b0cd4166afa7b9b8f78b82179563fd70 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 26 Dec 2014 12:36:30 +0000 Subject: kernel: backport a few PHY layer fixes from upstream Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43776 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...ck-for-aneg-completion-before-setting-sta.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch (limited to 'target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch') 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 new file mode 100644 index 0000000000..8e25f8c1bb --- /dev/null +++ b/target/linux/generic/patches-3.14/072-net-phy-Check-for-aneg-completion-before-setting-sta.patch @@ -0,0 +1,35 @@ +From: Balakumaran Kannan +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 +Reviewed-by: Florian Fainelli +Signed-off-by: David S. Miller +--- + +--- 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); -- cgit v1.2.3