From 2d6c437ceff5272e56acd0507b214565cf5f1054 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Fri, 11 Apr 2008 12:27:34 +0900 Subject: [PATCH] --- yaml --- r: 90853 b: refs/heads/master c: 81971bef4c4fce8571b7a31c09f94ee90eb738ec h: refs/heads/master i: 90851: 8954ae0ebb2cd26db8fc03f1309bd2ffda1fc597 v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f6aad11d52b3..90365c9b2c16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f225b427be7d3f2940fdebf5d79f753f38d3083 +refs/heads/master: 81971bef4c4fce8571b7a31c09f94ee90eb738ec diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index bccae7e5c6ad..f7781ec181f3 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1399,6 +1399,8 @@ spider_net_link_reset(struct net_device *netdev) spider_net_write_reg(card, SPIDER_NET_GMACINTEN, 0); /* reset phy and setup aneg */ + card->aneg_count = 0; + card->medium = BCM54XX_COPPER; spider_net_setup_aneg(card); mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER); @@ -1982,6 +1984,8 @@ spider_net_open(struct net_device *netdev) goto init_firmware_failed; /* start probing with copper */ + card->aneg_count = 0; + card->medium = BCM54XX_COPPER; spider_net_setup_aneg(card); if (card->phy.def->phy_id) mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER);