aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tg3.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 2c67cc95462..ebec88882c3 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -8193,10 +8193,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
8193 RDMAC_MODE_MBUF_RBD_CRPT_ENAB | 8193 RDMAC_MODE_MBUF_RBD_CRPT_ENAB |
8194 RDMAC_MODE_MBUF_SBD_CRPT_ENAB; 8194 RDMAC_MODE_MBUF_SBD_CRPT_ENAB;
8195 8195
8196 /* If statement applies to 5705 and 5750 PCI devices only */ 8196 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
8197 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 && 8197 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
8198 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
8199 (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
8200 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE && 8198 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
8201 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) { 8199 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
8202 rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128; 8200 rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
@@ -8369,17 +8367,14 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
8369 WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB | 8367 WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
8370 WDMAC_MODE_LNGREAD_ENAB); 8368 WDMAC_MODE_LNGREAD_ENAB);
8371 8369
8372 /* If statement applies to 5705 and 5750 PCI devices only */ 8370 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
8373 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 && 8371 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
8374 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
8375 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
8376 if ((tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) && 8372 if ((tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) &&
8377 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 || 8373 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
8378 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) { 8374 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
8379 /* nothing */ 8375 /* nothing */
8380 } else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) && 8376 } else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
8381 !(tp->tg3_flags2 & TG3_FLG2_IS_5788) && 8377 !(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
8382 !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
8383 val |= WDMAC_MODE_RX_ACCEL; 8378 val |= WDMAC_MODE_RX_ACCEL;
8384 } 8379 }
8385 } 8380 }