aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index efac448ded15..c91049bdaf63 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -8551,7 +8551,7 @@ static void tg3_timer(unsigned long __opaque)
8551 tg3_setup_phy(tp, 0); 8551 tg3_setup_phy(tp, 0);
8552 } 8552 }
8553 } else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && 8553 } else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) &&
8554 !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) { 8554 (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
8555 tg3_serdes_parallel_detect(tp); 8555 tg3_serdes_parallel_detect(tp);
8556 } 8556 }
8557 8557
@@ -13427,8 +13427,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13427 return err; 13427 return err;
13428 13428
13429 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && 13429 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 &&
13430 (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 || 13430 tp->pci_chip_rev_id != CHIPREV_ID_5717_A0)
13431 (tp->tg3_flags2 & TG3_FLG2_MII_SERDES)))
13432 return -ENOTSUPP; 13431 return -ENOTSUPP;
13433 13432
13434 /* Initialize data/descriptor byte/word swapping. */ 13433 /* Initialize data/descriptor byte/word swapping. */