diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2011-05-19 16:02:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 00:33:19 -0400 |
| commit | 7196cd6c3d4863000ef88b09f34d6dd75610ec3e (patch) | |
| tree | 141cc329914450896b57eedda72268bc92a60082 /drivers/net/tg3.c | |
| parent | d542fe27c86ecf932f40c898881208ccdaef9dc5 (diff) | |
| download | op-kernel-dev-7196cd6c3d4863000ef88b09f34d6dd75610ec3e.zip op-kernel-dev-7196cd6c3d4863000ef88b09f34d6dd75610ec3e.tar.gz | |
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>
Diffstat (limited to 'drivers/net/tg3.c')
| -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 284e998..db19332 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -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 || |
