From 7b3b882801fbbd9b9905a0da007af491467b7194 Mon Sep 17 00:00:00 2001 From: Jens Osterkamp Date: Fri, 16 Sep 2005 08:55:33 +0200 Subject: [PATCH] --- yaml --- r: 8978 b: refs/heads/master c: 53abbf7eeab22620586cbba272e569fd3e729b0b h: refs/heads/master 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 72c510694c21..5cc29e03e86c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b51292764a0ed46d7eb6bead4625ba83ee2ec05 +refs/heads/master: 53abbf7eeab22620586cbba272e569fd3e729b0b diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 4e19220473d0..c796f41b4a52 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1817,6 +1817,10 @@ spider_net_setup_phy(struct spider_net_card *card) /* LEDs active in both modes, autosense prio = fiber */ spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x945f); + /* switch off fibre autoneg */ + spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0xfc01); + spider_net_write_phy(card->netdev, 1, 0x0b, 0x0004); + phy->def->ops->read_link(phy); pr_info("Found %s with %i Mbps, %s-duplex.\n", phy->def->name, phy->speed, phy->duplex==1 ? "Full" : "Half");