diff options
| author | Ooiwa Naohiro <nooiwa@miraclelinux.com> | 2009-06-24 00:19:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-24 00:19:06 -0700 |
| commit | 7959ea254ed18faee41160b1c50b3c9664735967 (patch) | |
| tree | a623d403c00259f3ad3eb56e7b627176478dde55 | |
| parent | 0f77ca928b5d1ea17afc7a95682b6534611a719c (diff) | |
| download | linux-3.10-7959ea254ed18faee41160b1c50b3c9664735967.tar.gz linux-3.10-7959ea254ed18faee41160b1c50b3c9664735967.tar.bz2 linux-3.10-7959ea254ed18faee41160b1c50b3c9664735967.zip | |
bnx2: Fix the behavior of ethtool when ONBOOT=no
I found a little bug.
When configure in ifcfg-eth* is ONBOOT=no,
the behavior of ethtool command is wrong.
# grep ONBOOT /etc/sysconfig/network-scripts/ifcfg-eth2
ONBOOT=no
# ethtool eth2 | tail -n1
Link detected: yes
I think "Link detected" should be "no".
Signed-off-by: Ooiwa Naohiro <nooiwa@miraclelinux.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 38f1c3375d7..b70cc99962f 100644 --- a/drivers/net/bnx2.c +++ b/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, |