diff options
| author | Michael Chan <mchan@broadcom.com> | 2005-05-29 14:57:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-29 14:57:23 -0700 |
| commit | ca43007a92662621e5819912fc31c346e3a2eed8 (patch) | |
| tree | dc24a6753a4ba4629e0593cbabbcdb3281e06a63 | |
| parent | 566f86adb336637d03900f53b886d879aa5f5d56 (diff) | |
| download | blackbird-op-linux-ca43007a92662621e5819912fc31c346e3a2eed8.tar.gz blackbird-op-linux-ca43007a92662621e5819912fc31c346e3a2eed8.zip | |
[TG3]: Add link test
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/tg3.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index ab2fa213b301..30349c5fd73c 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7281,6 +7281,32 @@ out: return err; } +#define TG3_SERDES_TIMEOUT_SEC 2 +#define TG3_COPPER_TIMEOUT_SEC 6 + +static int tg3_test_link(struct tg3 *tp) +{ + int i, max; + + if (!netif_running(tp->dev)) + return -ENODEV; + + if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) + max = TG3_SERDES_TIMEOUT_SEC; + else + max = TG3_COPPER_TIMEOUT_SEC; + + for (i = 0; i < max; i++) { + if (netif_carrier_ok(tp->dev)) + return 0; + + if (msleep_interruptible(1000)) + break; + } + + return -EIO; +} + static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest, u64 *data) { @@ -7292,6 +7318,10 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest, etest->flags |= ETH_TEST_FL_FAILED; data[0] = 1; } + if (tg3_test_link(tp) != 0) { + etest->flags |= ETH_TEST_FL_FAILED; + data[1] = 1; + } } static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) |
