lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sky2: don't die if we see chip rev 0xb5

Browse Source 
There maybe new versions of Yukon2 in the future, so make the
driver more robust to handle this.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Stephen Hemminger
2005-12-09 11:34:53 -08:00
committed by Jeff Garzik
parent b1086eef81
commit 92f965e8c5
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/sky2.c
View File

@@ -128,17 +128,15 @@ MODULE_DEVICE_TABLE(pci, sky2_id_table);
static const unsigned txqaddr[] = { Q_XA1, Q_XA2 }; static const unsigned txqaddr[] = { Q_XA1, Q_XA2 };
static const unsigned rxqaddr[] = { Q_R1, Q_R2 }; static const unsigned rxqaddr[] = { Q_R1, Q_R2 };
static const char *yukon_name[] = { /* This driver supports yukon2 chipset only */
[CHIP_ID_YUKON_LITE - CHIP_ID_YUKON] = "Lite", /* 0xb0 */ static const char *yukon2_name[] = {
[CHIP_ID_YUKON_LP - CHIP_ID_YUKON] = "LP", /* 0xb2 */ "XL", /* 0xb3 */
[CHIP_ID_YUKON_XL - CHIP_ID_YUKON] = "XL", /* 0xb3 */ "EC Ultra", /* 0xb4 */
[CHIP_ID_YUKON_EC_U - CHIP_ID_YUKON] = "EC Ultra", /* 0xb4 */ "UNKNOWN", /* 0xb5 */
"EC", /* 0xb6 */
[CHIP_ID_YUKON_EC - CHIP_ID_YUKON] = "EC", /* 0xb6 */ "FE", /* 0xb7 */
[CHIP_ID_YUKON_FE - CHIP_ID_YUKON] = "FE", /* 0xb7 */
}; };
/* Access to external PHY */ /* Access to external PHY */
static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val) static int gm_phy_write(struct sky2_hw *hw, unsigned port, u16 reg, u16 val)
{ {
@@ -2951,7 +2949,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
printk(KERN_INFO PFX "v%s addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n", printk(KERN_INFO PFX "v%s addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",
DRV_VERSION, pci_resource_start(pdev, 0), pdev->irq, DRV_VERSION, pci_resource_start(pdev, 0), pdev->irq,
yukon_name[hw->chip_id - CHIP_ID_YUKON], yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL],
hw->chip_id, hw->chip_rev); hw->chip_id, hw->chip_rev);
dev = sky2_init_netdev(hw, 0, using_dac); dev = sky2_init_netdev(hw, 0, using_dac);