diff options
| author | Krzysztof Hałasa <khc@pm.waw.pl> | 2010-08-02 16:03:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-02 16:03:29 -0700 |
| commit | 9292d8f20ff3c034c99c2adfe27496957b3defe3 (patch) | |
| tree | b5d2df5bfdbf9aabf3ebcc4396c118306d1d3768 | |
| parent | 3f326d40994f922e0a3e468dd7fd9999eaf71574 (diff) | |
| download | op-kernel-dev-9292d8f20ff3c034c99c2adfe27496957b3defe3.zip op-kernel-dev-9292d8f20ff3c034c99c2adfe27496957b3defe3.tar.gz | |
Tulip: don't initialize SBE xT3E3 WAN ports.
SBE 2T3E3 cards use DECchips 21143 but they need a different driver.
Don't even try to use a normal tulip driver with them.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 6 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 14e5312..3a8d7ef 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -1341,6 +1341,12 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, if (pdev->subsystem_vendor == PCI_VENDOR_ID_LMC) { pr_err(PFX "skipping LMC card\n"); return -ENODEV; + } else if (pdev->subsystem_vendor == PCI_VENDOR_ID_SBE && + (pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_T3E3 || + pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P0 || + pdev->subsystem_device == PCI_SUBDEVICE_ID_SBE_2T3E3_P1)) { + pr_err(PFX "skipping SBE T3E3 port\n"); + return -ENODEV; } /* diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9ac60da..384c2a2 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1493,6 +1493,9 @@ #define PCI_DEVICE_ID_SBE_WANXL100 0x0301 #define PCI_DEVICE_ID_SBE_WANXL200 0x0302 #define PCI_DEVICE_ID_SBE_WANXL400 0x0104 +#define PCI_SUBDEVICE_ID_SBE_T3E3 0x0009 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P0 0x0901 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P1 0x0902 #define PCI_VENDOR_ID_TOSHIBA 0x1179 #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101 |
