netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3] net phylib: Remove unnecessary condition check in phy
@ 2014-04-09  3:33 Balakumaran Kannan
  2014-04-09 17:04 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Balakumaran Kannan @ 2014-04-09  3:33 UTC (permalink / raw)
  To: f.fainelli, netdev, davem

This condition check makes no difference in the code flow since 3.10

Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/phy/phy.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1d788f1..1b6d09a 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -756,12 +756,8 @@ void phy_state_machine(struct work_struct *work)
 			netif_carrier_on(phydev->attached_dev);
 			phydev->adjust_link(phydev->attached_dev);
 
-		} else if (0 == phydev->link_timeout--) {
+		} else if (0 == phydev->link_timeout--)
 			needs_aneg = 1;
-			/* If we have the magic_aneg bit, we try again */
-			if (phydev->drv->flags & PHY_HAS_MAGICANEG)
-				break;
-		}
 		break;
 	case PHY_NOLINK:
 		err = phy_read_status(phydev);
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3] net phylib: Remove unnecessary condition check in phy
  2014-04-09  3:33 [PATCH v3] net phylib: Remove unnecessary condition check in phy Balakumaran Kannan
@ 2014-04-09 17:04 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-04-09 17:04 UTC (permalink / raw)
  To: kumaran.4353; +Cc: f.fainelli, netdev

From: Balakumaran Kannan <kumaran.4353@gmail.com>
Date: Wed, 09 Apr 2014 09:03:45 +0530

> This condition check makes no difference in the code flow since 3.10
> 
> Signed-off-by: Balakumaran Kannan <kumaran.4353@gmail.com>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-04-09 17:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-09  3:33 [PATCH v3] net phylib: Remove unnecessary condition check in phy Balakumaran Kannan
2014-04-09 17:04 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).