Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81971bef authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Jeff Garzik
Browse files

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: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarJens Osterkamp <jens@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 7f225b42

drivers/net/spider_net.c

+4 −0
Original line number Diff line number Diff line
@@ -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);