summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVitalii Demianets <vitas@nppfactor.kiev.ua>2012-11-02 11:09:24 +0400
committerDavid S. Miller <davem@davemloft.net>2012-11-03 23:37:35 +0400
commit26cdfb4915a9a408f4c1f04111999a11eb0ee606 (patch)
tree4bd16f44fb853cbd41c2521c6475106d7cdb090d /drivers
parent7f2cd328d4bf4634c53b3a8b23bb92c7e17af538 (diff)
downloadlinux-26cdfb4915a9a408f4c1f04111999a11eb0ee606.tar.xz
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 <vitas@nppfactor.kiev.ua> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/cadence/macb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index c37487535125..13c3c332f58d 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);