diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-11-13 08:03:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-16 01:14:54 -0500 |
commit | 5001e2f638011859c1351f9fe57ca4e545a15c47 (patch) | |
tree | 7ba357c34b36bfe9f855ac93f78c46c7a87fb081 /drivers/net/tg3.c | |
parent | b196c7e45f30cbcd38c83386bc8a04a21477f8d3 (diff) |
tg3: Fix DIDs, Enable 5717 support
This patch fixes the 5717 variant device ID enumerations and adds those
DIDs to the PCI ID table.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 10 |
1 files changed, 6 insertions, 4 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); |