aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tg3.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e75e000df315..46f8da6fc116 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5237,10 +5237,8 @@ static int tg3_reset_hw(struct tg3 *tp)
5237 RDMAC_MODE_LNGREAD_ENAB); 5237 RDMAC_MODE_LNGREAD_ENAB);
5238 if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE) 5238 if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
5239 rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE; 5239 rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE;
5240 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 && 5240 if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
5241 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) || 5241 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
5242 (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
5243 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)) {
5244 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE && 5242 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
5245 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 || 5243 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
5246 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) { 5244 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
@@ -5353,10 +5351,8 @@ static int tg3_reset_hw(struct tg3 *tp)
5353 WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB | 5351 WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
5354 WDMAC_MODE_LNGREAD_ENAB); 5352 WDMAC_MODE_LNGREAD_ENAB);
5355 5353
5356 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 && 5354 if ((tp->tg3_flags2 & TG3_FLG2_5705_PLUS) &&
5357 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) || 5355 tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
5358 (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
5359 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)) {
5360 if ((tp->tg3_flags & TG3_FLG2_TSO_CAPABLE) && 5356 if ((tp->tg3_flags & TG3_FLG2_TSO_CAPABLE) &&
5361 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 || 5357 (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
5362 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) { 5358 tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {