From 1e4f1719216ce0a3336b03a2a7b07ee30e5efcdd Mon Sep 17 00:00:00 2001 From: Li Yang Date: Tue, 6 Jan 2009 14:08:10 -0800 Subject: [PATCH] --- yaml --- r: 127776 b: refs/heads/master c: f430e49e9e0cf821c090abedb399b80ebf0cb4c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 445769864400..77640e0f9564 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fa17d4ba43d7e5aab5e90777b07da06524f6748 +refs/heads/master: f430e49e9e0cf821c090abedb399b80ebf0cb4c6 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index c672ecfc9595..7fcc3af3f86b 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -1973,6 +1973,8 @@ static void adjust_link(struct net_device *dev) case 1000: tempval = ((tempval & ~(MACCFG2_IF)) | MACCFG2_GMII); + + ecntrl &= ~(ECNTRL_R100); break; case 100: case 10: