aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2008-04-10 23:27:34 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-16 20:06:50 -0400
commit81971bef4c4fce8571b7a31c09f94ee90eb738ec (patch)
treed6e2eb3b3c1c08869dd879751fe34b4495363f1e /drivers
parent7f225b427be7d3f2940fdebf5d79f753f38d3083 (diff)
spidernet: add missing initialization
This patch fixes initialization of "aneg_count" and "medium" fields in spider_net_card to make spidernet driver correctly sets "link status". Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Acked-by: Jens Osterkamp <jens@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/spider_net.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index bccae7e5c6ad..f7781ec181f3 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1399,6 +1399,8 @@ spider_net_link_reset(struct net_device *netdev)
1399 spider_net_write_reg(card, SPIDER_NET_GMACINTEN, 0); 1399 spider_net_write_reg(card, SPIDER_NET_GMACINTEN, 0);
1400 1400
1401 /* reset phy and setup aneg */ 1401 /* reset phy and setup aneg */
1402 card->aneg_count = 0;
1403 card->medium = BCM54XX_COPPER;
1402 spider_net_setup_aneg(card); 1404 spider_net_setup_aneg(card);
1403 mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER); 1405 mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER);
1404 1406
@@ -1982,6 +1984,8 @@ spider_net_open(struct net_device *netdev)
1982 goto init_firmware_failed; 1984 goto init_firmware_failed;
1983 1985
1984 /* start probing with copper */ 1986 /* start probing with copper */
1987 card->aneg_count = 0;
1988 card->medium = BCM54XX_COPPER;
1985 spider_net_setup_aneg(card); 1989 spider_net_setup_aneg(card);
1986 if (card->phy.def->phy_id) 1990 if (card->phy.def->phy_id)
1987 mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER); 1991 mod_timer(&card->aneg_timer, jiffies + SPIDER_NET_ANEG_TIMER);