diff options
-rw-r--r-- | drivers/net/tg3.c | 10 | ||||
-rw-r--r-- | drivers/net/tg3.h | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 3ff2d40e63dd..b01ea2e9ab5f 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -241,6 +241,9 @@ static struct pci_device_id tg3_pci_tbl[] = { | |||
241 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)}, | 241 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57760)}, |
242 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)}, | 242 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57790)}, |
243 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57788)}, | 243 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57788)}, |
244 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5717)}, | ||
245 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5718)}, | ||
246 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5724)}, | ||
244 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, | 247 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, |
245 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, | 248 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, |
246 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, | 249 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, |
@@ -12702,10 +12705,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
12702 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_USE_PROD_ID_REG) { | 12705 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_USE_PROD_ID_REG) { |
12703 | u32 prod_id_asic_rev; | 12706 | u32 prod_id_asic_rev; |
12704 | 12707 | ||
12705 | if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717C || | 12708 | if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717 || |
12706 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5717S || | 12709 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 || |
12707 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718C || | 12710 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5724) |
12708 | tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718S) | ||
12709 | pci_read_config_dword(tp->pdev, | 12711 | pci_read_config_dword(tp->pdev, |
12710 | TG3PCI_GEN2_PRODID_ASICREV, | 12712 | TG3PCI_GEN2_PRODID_ASICREV, |
12711 | &prod_id_asic_rev); | 12713 | &prod_id_asic_rev); |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 6be46abb1321..453a34fb72b9 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -46,10 +46,9 @@ | |||
46 | #define TG3PCI_DEVICE_TIGON3_57788 0x1691 | 46 | #define TG3PCI_DEVICE_TIGON3_57788 0x1691 |
47 | #define TG3PCI_DEVICE_TIGON3_5785_G 0x1699 /* GPHY */ | 47 | #define TG3PCI_DEVICE_TIGON3_5785_G 0x1699 /* GPHY */ |
48 | #define TG3PCI_DEVICE_TIGON3_5785_F 0x16a0 /* 10/100 only */ | 48 | #define TG3PCI_DEVICE_TIGON3_5785_F 0x16a0 /* 10/100 only */ |
49 | #define TG3PCI_DEVICE_TIGON3_5717C 0x1655 | 49 | #define TG3PCI_DEVICE_TIGON3_5717 0x1655 |
50 | #define TG3PCI_DEVICE_TIGON3_5717S 0x1656 | 50 | #define TG3PCI_DEVICE_TIGON3_5718 0x1656 |
51 | #define TG3PCI_DEVICE_TIGON3_5718C 0x1665 | 51 | #define TG3PCI_DEVICE_TIGON3_5724 0x165c |
52 | #define TG3PCI_DEVICE_TIGON3_5718S 0x1666 | ||
53 | /* 0x04 --> 0x64 unused */ | 52 | /* 0x04 --> 0x64 unused */ |
54 | #define TG3PCI_MSI_DATA 0x00000064 | 53 | #define TG3PCI_MSI_DATA 0x00000064 |
55 | /* 0x66 --> 0x68 unused */ | 54 | /* 0x66 --> 0x68 unused */ |