Commit be62bda5 authored by David S. Miller's avatar David S. Miller

[TG3]: Remove autoneg handling from fibre_autoneg() unneeded.

Signed-off-by: default avatarDavid S. Miller <davem@redhat.com>
parent 9dfef3da
...@@ -1968,22 +1968,6 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp, ...@@ -1968,22 +1968,6 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,
static int fiber_autoneg(struct tg3 *tp, u32 *flags) static int fiber_autoneg(struct tg3 *tp, u32 *flags)
{ {
int res = 0; int res = 0;
if (tp->tg3_flags2 & TG3_FLG2_HW_AUTONEG) {
u32 dig_status;
dig_status = tr32(SG_DIG_STATUS);
*flags = 0;
if (dig_status & SG_DIG_PARTNER_ASYM_PAUSE)
*flags |= MR_LP_ADV_ASYM_PAUSE;
if (dig_status & SG_DIG_PARTNER_PAUSE_CAPABLE)
*flags |= MR_LP_ADV_SYM_PAUSE;
if ((dig_status & SG_DIG_AUTONEG_COMPLETE) &&
!(dig_status & (SG_DIG_AUTONEG_ERROR |
SG_DIG_PARTNER_FAULT_MASK)))
res = 1;
} else {
struct tg3_fiber_aneginfo aninfo; struct tg3_fiber_aneginfo aninfo;
int status = ANEG_FAILED; int status = ANEG_FAILED;
unsigned int tick; unsigned int tick;
...@@ -2021,7 +2005,6 @@ static int fiber_autoneg(struct tg3 *tp, u32 *flags) ...@@ -2021,7 +2005,6 @@ static int fiber_autoneg(struct tg3 *tp, u32 *flags)
(aninfo.flags & (MR_AN_COMPLETE | MR_LINK_OK | (aninfo.flags & (MR_AN_COMPLETE | MR_LINK_OK |
MR_LP_ADV_FULL_DUPLEX))) MR_LP_ADV_FULL_DUPLEX)))
res = 1; res = 1;
}
return res; return res;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment