netdev
[Top] [All Lists]

[patch 2.6.9-rc2] 3c59x: remove EEPROM_RESET for 3c905B

To: akpm@xxxxxxxx
Subject: [patch 2.6.9-rc2] 3c59x: remove EEPROM_RESET for 3c905B
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
Date: Sun, 17 Oct 2004 11:05:11 -0400
Cc: netdev@xxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
In-reply-to: <20040928145455.C12480@xxxxxxxxxxxxx>
Mail-followup-to: akpm@xxxxxxxx, netdev@xxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
References: <20040928145455.C12480@xxxxxxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
Remove the EEPROM_RESET flag for the 3c905B cards.

Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---
Looks like I over-reached.  Apparently only the 3c905 cards actually
need the EEPROM reset, and the 3c905B cards don't like it...

 drivers/net/3c59x.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- linux-2.6/drivers/net/3c59x.c.orig  2004-10-17 10:53:38.142281232 -0400
+++ linux-2.6/drivers/net/3c59x.c       2004-10-17 10:54:25.975009552 -0400
@@ -508,12 +508,12 @@ static struct vortex_chip_info {
        {"3c905 Boomerang 100baseT4",
         PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_RESET, 64, },
        {"3c905B Cyclone 100baseTx",
-        PCI_USES_IO|PCI_USES_MASTER, 
IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE|EEPROM_RESET, 128, },
+        PCI_USES_IO|PCI_USES_MASTER, 
IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
 
        {"3c905B Cyclone 10/100/BNC",
-        PCI_USES_IO|PCI_USES_MASTER, 
IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EEPROM_RESET, 128, },
+        PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY|HAS_HWCKSM, 128, },
        {"3c905B-FX Cyclone 100baseFx",
-        PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM|EEPROM_RESET, 128, 
},
+        PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_HWCKSM, 128, },
        {"3c905C Tornado",
        PCI_USES_IO|PCI_USES_MASTER, 
IS_TORNADO|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
        {"3c920B-EMB-WNM (ATI Radeon 9100 IGP)",
@@ -564,7 +564,7 @@ static struct vortex_chip_info {
        {"3c982 Hydra Dual Port B",
         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_HWCKSM|HAS_NWAY, 128, },
        {"3c905B-T4",
-        PCI_USES_IO|PCI_USES_MASTER, 
IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE|EEPROM_RESET, 128, },
+        PCI_USES_IO|PCI_USES_MASTER, 
IS_CYCLONE|HAS_NWAY|HAS_HWCKSM|EXTRA_PREAMBLE, 128, },
        {"3c920B-EMB-WNM Tornado",
         PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|HAS_HWCKSM, 128, },
 
-- 
John W. Linville
linville@xxxxxxxxxxxxx

<Prev in Thread] Current Thread [Next in Thread>
  • [patch 2.6.9-rc2] 3c59x: remove EEPROM_RESET for 3c905B, John W. Linville <=