From: Vitalii Demianets Date: Fri, 2 Nov 2012 07:09:24 +0000 (+0000) Subject: macb: Keep driver's speed/duplex in sync with actual NCFGR X-Git-Tag: master-2012-12-14~5^2~451 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=26cdfb4915a9a408f4c1f04111999a11eb0ee606;p=~andy%2Flinux macb: Keep driver's speed/duplex in sync with actual NCFGR When underlying phy driver restores its state very fast after being brought down and up so that macb driver function macb_handle_link_change() was never called with link state "down", driver's internal representation of phy speed and duplex (bp->speed and bp->duplex) didn't change. So, macb driver sees no reason to perform actual write to the NCFGR register, although the speed and duplex settings in that register were reset when interface was brought down and up. In that case actual phy speed and duplex differ from NCFGR settings. The patch fixes that by keeping internal driver representation of speed and duplex in sync with actual content of NCFGR. Signed-off-by: Vitalii Demianets Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index c3748753512..13c3c332f58 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1031,6 +1031,8 @@ static void macb_init_hw(struct macb *bp) config |= MACB_BIT(NBC); /* No BroadCast */ config |= macb_dbw(bp); macb_writel(bp, NCFGR, config); + bp->speed = SPEED_10; + bp->duplex = DUPLEX_HALF; macb_configure_dma(bp);