diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2011-05-19 12:02:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-20 00:33:19 -0400 |
commit | 7196cd6c3d4863000ef88b09f34d6dd75610ec3e (patch) | |
tree | 141cc329914450896b57eedda72268bc92a60082 | |
parent | d542fe27c86ecf932f40c898881208ccdaef9dc5 (diff) |
tg3: Add braces around 5906 workaround.
Commit dabc5c670d3f86d15ee4f42ab38ec5bd2682487d, 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: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 284e99853ed3..db19332a7d87 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -13707,9 +13707,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
13707 | tp->pcie_cap + PCI_EXP_LNKCTL, | 13707 | tp->pcie_cap + PCI_EXP_LNKCTL, |
13708 | &lnkctl); | 13708 | &lnkctl); |
13709 | if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) { | 13709 | if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) { |
13710 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) | 13710 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == |
13711 | ASIC_REV_5906) { | ||
13711 | tg3_flag_clear(tp, HW_TSO_2); | 13712 | tg3_flag_clear(tp, HW_TSO_2); |
13712 | tg3_flag_clear(tp, TSO_CAPABLE); | 13713 | tg3_flag_clear(tp, TSO_CAPABLE); |
13714 | } | ||
13713 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || | 13715 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || |
13714 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 || | 13716 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 || |
13715 | tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 || | 13717 | tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 || |