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

Commit 7196cd6c authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Add braces around 5906 workaround. 



Commit dabc5c67, entitled
"tg3: Move TSO_CAPABLE assignment", moved some TSO flagging code around.
In the process it failed to add braces around an exceptional 5906
condition.  This patch fixes the problem.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d542fe27

drivers/net/tg3.c

+3 −1
Original line number Diff line number Diff line
@@ -13707,9 +13707,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
				     tp->pcie_cap + PCI_EXP_LNKCTL,

				     &lnkctl);

		if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) {

			if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)

			if (GET_ASIC_REV(tp->pci_chip_rev_id) ==

			    ASIC_REV_5906) {

				tg3_flag_clear(tp, HW_TSO_2);

				tg3_flag_clear(tp, TSO_CAPABLE);

			}

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

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

			    tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 ||