PATCH: eliminate bogus invalid checksum warning for 3c905c (CORRECTION)

From: I Lee Hetherington (ilh@sls.lcs.mit.edu)
Date: Thu May 18 2000 - 10:11:52 EST


Pardon me, but I munged up the first patch. Here is a correction.

--Lee Hetherington

diff -urN linux-2.2.16-pre2/drivers/net/3c59x.c linux/drivers/net/3c59x.c
--- linux-2.2.16-pre2/drivers/net/3c59x.c Thu May 18 10:32:28 2000
+++ linux/drivers/net/3c59x.c Thu May 18 10:53:48 2000
@@ -256,7 +256,7 @@
                                                          long ioaddr, int irq, int chip_idx, int fnd_cnt);
 };
 
-enum { IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=4,
+enum { IS_VORTEX=1, IS_BOOMERANG=2, IS_CYCLONE=4, IS_TORNADO=8,
            HAS_PWR_CTRL=0x10, HAS_MII=0x20, HAS_NWAY=0x40, HAS_CB_FNS=0x80, };
 static struct device *vortex_probe1(int pci_bus, int pci_devfn,
                                                                         struct device *dev, long ioaddr,
@@ -301,7 +301,7 @@
         {"3c905B-FX Cyclone 100baseFx", 0x10B7, 0x905A, 0xffff,
          PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE, 128, vortex_probe1},
         {"3c905C Tornado", 0x10B7, 0x9200, 0xffff,
- PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_NWAY, 128, vortex_probe1},
+ PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY, 128, vortex_probe1},
         {"3c980 Cyclone", 0x10B7, 0x9800, 0xfff0,
          PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE, 128, vortex_probe1},
         {"3cSOHO100-TX Hurricane", 0x10B7, 0x7646, 0xffff,
@@ -907,7 +907,7 @@
                         checksum ^= eeprom[i++];
                 checksum = (checksum ^ (checksum >> 8)) & 0xff;
         }
- if (checksum != 0x00)
+ if (checksum != 0x00 && !(pci_tbl[chip_idx].drv_flags & IS_TORNADO))
                 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
 
         for (i = 0; i < 3; i++)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue May 23 2000 - 21:00:15 EST