[PATCH 2/3] net/phy: avoid reaching an unsupported speed and duplex combination
From: Madalin Bucur <hidden>
Date: 2011-10-06 16:48:23
Subsystem:
ethernet phy library, networking drivers, the rest · Maintainers:
Andrew Lunn, Heiner Kallweit, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
- phy_force_reduction() may get the interface into a speed and duplex combination that is not supported by the device; - wait PHY_FORCE_TIMEOUT before each speed/duplex reduction in forced mode Signed-off-by: Madalin Bucur <redacted> --- drivers/net/phy/phy.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 79268f6..31d6519 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c@@ -6,7 +6,7 @@ * * Author: Andy Fleming * - * Copyright (c) 2004 Freescale Semiconductor, Inc. + * Copyright (c) 2004,2011 Freescale Semiconductor, Inc. * Copyright (c) 2006, 2007 Maciej W. Rozycki * * This program is free software; you can redistribute it and/or modify it
@@ -479,6 +479,10 @@ static void phy_force_reduction(struct phy_device *phydev) idx = phy_find_valid(idx, phydev->supported); + /* Avoid reaching an invalid speed and duplex combination */ + if (!(settings[idx].setting & phydev->supported)) + return; + phydev->speed = settings[idx].speed; phydev->duplex = settings[idx].duplex;
@@ -869,6 +873,8 @@ void phy_state_machine(struct work_struct *work) if (0 == phydev->link_timeout--) { phy_force_reduction(phydev); needs_aneg = 1; + phydev->link_timeout = + PHY_FORCE_TIMEOUT; } }
--
1.7.0.1