Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340583
b: refs/heads/master
c: 83cdbc7
h: refs/heads/master
i:
  340581: e57e6d4
  340579: 8b58777
  340575: e050822
v: v3
  • Loading branch information
Nicolas Ferre authored and David S. Miller committed Nov 1, 2012
1 parent 2065960 commit 07d684e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 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: a268adb1c848c90c8adfafdf647b0d8d8f90eaff
refs/heads/master: 83cdbc7da7a9b6d5413c27ebb05cf6d505469462
11 changes: 0 additions & 11 deletions trunk/drivers/net/ethernet/cadence/macb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1225,20 +1225,9 @@ static int macb_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
return phy_ethtool_sset(phydev, cmd);
}

static void macb_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
struct macb *bp = netdev_priv(dev);

strcpy(info->driver, bp->pdev->dev.driver->name);
strcpy(info->version, "$Revision: 1.14 $");
strcpy(info->bus_info, dev_name(&bp->pdev->dev));
}

const struct ethtool_ops macb_ethtool_ops = {
.get_settings = macb_get_settings,
.set_settings = macb_set_settings,
.get_drvinfo = macb_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ts_info = ethtool_op_get_ts_info,
};
Expand Down

0 comments on commit 07d684e

Please sign in to comment.