Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 154115
b: refs/heads/master
c: 7959ea2
h: refs/heads/master
i:
  154113: 9389175
  154111: 51a4ebf
v: v3
  • Loading branch information
Ooiwa Naohiro authored and David S. Miller committed Jun 24, 2009
1 parent eb01f64 commit ea052e2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f77ca928b5d1ea17afc7a95682b6534611a719c
refs/heads/master: 7959ea254ed18faee41160b1c50b3c9664735967
10 changes: 9 additions & 1 deletion trunk/drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ea052e2

Please sign in to comment.