diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-09-15 04:59:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-15 17:16:12 -0400 |
commit | 2e9f7a7408d264f01d4477c564ef5c6b610cd10f (patch) | |
tree | 886d7fcf7b8aa0283f9c0de9b916ef8064dd84dd | |
parent | dc6d074457f1551f9357f773a4eda09a3d5ef150 (diff) |
tg3: Unlock 5717 B0+ support
This patch adjusts the driver to use the tg3_start_xmit_dma_bug()
transmit routine for all revisions of 5717 asic rev devices and then
allows the driver to attach to B0 and later devices.
Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index fc9706c8e3c6..4e92b81bccfa 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -13431,10 +13431,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
13431 | if (err) | 13431 | if (err) |
13432 | return err; | 13432 | return err; |
13433 | 13433 | ||
13434 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && | ||
13435 | tp->pci_chip_rev_id != CHIPREV_ID_5717_A0) | ||
13436 | return -ENOTSUPP; | ||
13437 | |||
13438 | /* Initialize data/descriptor byte/word swapping. */ | 13434 | /* Initialize data/descriptor byte/word swapping. */ |
13439 | val = tr32(GRC_MODE); | 13435 | val = tr32(GRC_MODE); |
13440 | val &= GRC_MODE_HOST_STACKUP; | 13436 | val &= GRC_MODE_HOST_STACKUP; |
@@ -14463,7 +14459,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
14463 | } | 14459 | } |
14464 | 14460 | ||
14465 | if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) && | 14461 | if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) && |
14466 | tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 && | 14462 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 && |
14467 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719) | 14463 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719) |
14468 | dev->netdev_ops = &tg3_netdev_ops; | 14464 | dev->netdev_ops = &tg3_netdev_ops; |
14469 | else | 14465 | else |