Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of bug fixes in 'net' overlapping other changes in 'net-next-. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -882,6 +882,13 @@ static int stmmac_init_phy(struct net_device *dev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* stmmac_adjust_link will change this to PHY_IGNORE_INTERRUPT to avoid
|
||||
* subsequent PHY polling, make sure we force a link transition if
|
||||
* we have a UP/DOWN/UP transition
|
||||
*/
|
||||
if (phydev->is_pseudo_fixed_link)
|
||||
phydev->irq = PHY_POLL;
|
||||
|
||||
pr_debug("stmmac_init_phy: %s: attached to PHY (UID 0x%x)"
|
||||
" Link = %d\n", dev->name, phydev->phy_id, phydev->link);
|
||||
|
||||
|
Reference in New Issue
Block a user