From 42800c2dd30c8c51cc6403e13fc4f06270942e20 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 21 Jul 2010 02:51:13 +0000 Subject: [PATCH] --- yaml --- r: 203669 b: refs/heads/master c: 4bee1f9ac066ef0350b961eab9fedc4d0bd0a549 h: refs/heads/master i: 203667: 74b2cea5775f8d015521e13dbcdfb611fc21e3fb v: v3 --- [refs] | 2 +- trunk/drivers/net/fec.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f92d0065d447..933d270bc1fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cd47ea19bf8c6f9d3a41b3c312237d007138ae0 +refs/heads/master: 4bee1f9ac066ef0350b961eab9fedc4d0bd0a549 diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c index 391a553a3add..768b840aeb6b 100644 --- a/trunk/drivers/net/fec.c +++ b/trunk/drivers/net/fec.c @@ -118,6 +118,8 @@ static unsigned char fec_mac_default[] = { #define FEC_ENET_MII ((uint)0x00800000) /* MII interrupt */ #define FEC_ENET_EBERR ((uint)0x00400000) /* SDMA bus error */ +#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII) + /* The FEC stores dest/src/type, data, and checksum for receive packets. */ #define PKT_MAXBUF_SIZE 1518 @@ -1213,8 +1215,7 @@ fec_restart(struct net_device *dev, int duplex) writel(0, fep->hwp + FEC_R_DES_ACTIVE); /* Enable interrupts we wish to service */ - writel(FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII, - fep->hwp + FEC_IMASK); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); } static void @@ -1233,8 +1234,8 @@ fec_stop(struct net_device *dev) /* Whack a reset. We should wait for this. */ writel(1, fep->hwp + FEC_ECNTRL); udelay(10); - writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); } static int __devinit