aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale
diff options
context:
space:
mode:
authorJim Baxter <jim_baxter@mentor.com>2013-07-01 09:57:54 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-02 15:40:52 -0400
commitb9eef55c2ab33053ae236b5d383965f9ee6a0094 (patch)
treefc22d73bb925e1fd4face8b9101debf3962185ca /drivers/net/ethernet/freescale
parent7cc47d139f9a815a91bd9e7377063238c69a0423 (diff)
net: fec: Fix RMON registers on imx6
commit 38ae92d "fec: Add support for reading RMON registers" causes the imx6Q to crash. This fixes it by only enabling the RMON registers, the registers are already cleared by the MAC being reset. Signed-off-by: Jim Baxter <jim_baxter@mentor.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index aff8a5cd17c7..b6768821757b 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -606,11 +606,8 @@ fec_restart(struct net_device *ndev, int duplex)
606 ecntl |= (1 << 4); 606 ecntl |= (1 << 4);
607 607
608#ifndef CONFIG_M5272 608#ifndef CONFIG_M5272
609 /* Disable, clear, and enable the MIB */ 609 /* Enable the MIB statistic event counters */
610 writel(1 << 31, fep->hwp + FEC_MIB_CTRLSTAT); 610 writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT);
611 for (i = RMON_T_DROP; i < IEEE_R_OCTETS_OK; i++)
612 writel(0, fep->hwp + i);
613 writel(0, fep->hwp + FEC_MIB_CTRLSTAT);
614#endif 611#endif
615 612
616 /* And last, enable the transmit and receive processing */ 613 /* And last, enable the transmit and receive processing */