Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb7064dc authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

[TG3]: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants 



Rewrite checks in tg3_get_invariants to use TG3_FLG2_5705_PLUS and
TG3_FLG2_5750_PLUS flags.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 863925f5

drivers/net/tg3.c

+2 −5
Original line number Diff line number Diff line
@@ -7937,8 +7937,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)

		tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)

	if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)

		tp->tg3_flags2 |= TG3_FLG2_HW_TSO;



	if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
@@ -8068,9 +8067,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)

		tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;



	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)

	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)

		tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;



	/* Only 5701 and later support tagged irq status mode.