diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2010-07-11 13:31:43 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-12 04:07:42 +0400 |
| commit | 2138c002173abe3e439e213e5cc03b385b20508c (patch) | |
| tree | 226d7dd672721686428e24556945f296a8e3134e /drivers | |
| parent | 34195c3dce84fd0ee47f4131584ff1f6f283b93c (diff) | |
| download | linux-2138c002173abe3e439e213e5cc03b385b20508c.tar.xz | |
tg3: Relax 5717 serdes restriction
tg3 is coded to refuse to attach to 5717 serdes devices. Now that the
hardware is better supported, we can relax this restriction. This patch
also fixes a recently introduced bug which will cause serdes parallel
detection not to work with 5780 class devices.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 5 |
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) tg3_setup_phy(tp, 0); } } else if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && - !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) { + (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) { tg3_serdes_parallel_detect(tp); } @@ -13427,8 +13427,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) return err; if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && - (tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 || - (tp->tg3_flags2 & TG3_FLG2_MII_SERDES))) + tp->pci_chip_rev_id != CHIPREV_ID_5717_A0) return -ENOTSUPP; /* Initialize data/descriptor byte/word swapping. */ |