From ea052e2391bb2348344630a08880e82c126785b3 Mon Sep 17 00:00:00 2001 From: Ooiwa Naohiro Date: Wed, 24 Jun 2009 00:19:06 -0700 Subject: [PATCH] --- yaml --- r: 154115 b: refs/heads/master c: 7959ea254ed18faee41160b1c50b3c9664735967 h: refs/heads/master i: 154113: 93891754f369d8dfa5b3e9add189b0919739251d 154111: 51a4ebf1ce62f2681a7a73c1373fd125a609a339 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8820923b3915..8433c7b513b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f77ca928b5d1ea17afc7a95682b6534611a719c +refs/heads/master: 7959ea254ed18faee41160b1c50b3c9664735967 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 38f1c3375d7f..b70cc99962fc 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -6825,6 +6825,14 @@ bnx2_nway_reset(struct net_device *dev) return 0; } +static u32 +bnx2_get_link(struct net_device *dev) +{ + struct bnx2 *bp = netdev_priv(dev); + + return bp->link_up; +} + static int bnx2_get_eeprom_len(struct net_device *dev) { @@ -7392,7 +7400,7 @@ static const struct ethtool_ops bnx2_ethtool_ops = { .get_wol = bnx2_get_wol, .set_wol = bnx2_set_wol, .nway_reset = bnx2_nway_reset, - .get_link = ethtool_op_get_link, + .get_link = bnx2_get_link, .get_eeprom_len = bnx2_get_eeprom_len, .get_eeprom = bnx2_get_eeprom, .set_eeprom = bnx2_set_eeprom,