summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJens Osterkamp <Jens.Osterkamp@de.ibm.com>2005-09-16 08:55:33 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-16 03:23:12 -0400
commit53abbf7eeab22620586cbba272e569fd3e729b0b (patch)
tree996ed1088d5b82b8ec9725cad26a2b8cf23f2462 /drivers
parent8b51292764a0ed46d7eb6bead4625ba83ee2ec05 (diff)
[PATCH] net: fix spider_net media detection
This patch makes the driver work with any BladeCenter network switch, it used to work only with certain models. Please apply. Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.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 4e19220473d0..c796f41b4a52 100644
--- a/drivers/net/spider_net.c
+++ b/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");