提交 7196cd6c 编写于 作者: M Matt Carlson 提交者: David S. Miller

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: NMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d542fe27
...@@ -13707,9 +13707,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) ...@@ -13707,9 +13707,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
tp->pcie_cap + PCI_EXP_LNKCTL, tp->pcie_cap + PCI_EXP_LNKCTL,
&lnkctl); &lnkctl);
if (lnkctl & PCI_EXP_LNKCTL_CLKREQ_EN) { 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, HW_TSO_2);
tg3_flag_clear(tp, TSO_CAPABLE); tg3_flag_clear(tp, TSO_CAPABLE);
}
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761 ||
tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 || tp->pci_chip_rev_id == CHIPREV_ID_57780_A0 ||
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册