nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net phylib: Remove unnecessary condition check in phy

Browse source 
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Balakumaran Kannan 2014-04-09 09:03:45 +05:30 committed by David S. Miller
parent 1e1cdf8ac7
commit fa8cddaf90
1 changed files with 1 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/phy/phy.c
View file

@ -756,12 +756,8 @@ void phy_state_machine(struct work_struct *work)
netif_carrier_on(phydev->attached_dev); netif_carrier_on(phydev->attached_dev);
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
} else if (0 == phydev->link_timeout--) { } else if (0 == phydev->link_timeout--)
needs_aneg = 1; needs_aneg = 1;
/* If we have the magic_aneg bit, we try again */
if (phydev->drv->flags & PHY_HAS_MAGICANEG)
break;
}
break; break;
case PHY_NOLINK: case PHY_NOLINK:
err = phy_read_status(phydev); err = phy_read_status(phydev);