diff options
| author | Philippe Reynes <tremyfr@gmail.com> | 2016-07-02 23:37:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-05 00:59:51 +0200 |
| commit | f4400ded03b46a8288d6d5ca4bfb6bb29dbcbb94 (patch) | |
| tree | 577b914bd4332b8a26def02e8ff7179a039559fd /drivers/net/ethernet/cavium | |
| parent | net: ethernet: cavium: octeon: use phydev from struct net_device (diff) | |
| download | linux-f4400ded03b46a8288d6d5ca4bfb6bb29dbcbb94.tar.xz linux-f4400ded03b46a8288d6d5ca4bfb6bb29dbcbb94.zip | |
net: ethernet: cavium: octeon: use phy_ethtool_{get|set}_link_ksettings
There are two generics functions phy_ethtool_{get|set}_link_ksettings,
so we can use them instead of defining the same code in the driver.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium')
| -rw-r--r-- | drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c index de678e67dae4..e8bc15bcde70 100644 --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c @@ -1346,27 +1346,6 @@ static void octeon_mgmt_get_drvinfo(struct net_device *netdev, strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); } -static int octeon_mgmt_get_settings(struct net_device *netdev, - struct ethtool_cmd *cmd) -{ - if (netdev->phydev) - return phy_ethtool_gset(netdev->phydev, cmd); - - return -EOPNOTSUPP; -} - -static int octeon_mgmt_set_settings(struct net_device *netdev, - struct ethtool_cmd *cmd) -{ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - - if (netdev->phydev) - return phy_ethtool_sset(netdev->phydev, cmd); - - return -EOPNOTSUPP; -} - static int octeon_mgmt_nway_reset(struct net_device *dev) { if (!capable(CAP_NET_ADMIN)) @@ -1380,10 +1359,10 @@ static int octeon_mgmt_nway_reset(struct net_device *dev) static const struct ethtool_ops octeon_mgmt_ethtool_ops = { .get_drvinfo = octeon_mgmt_get_drvinfo, - .get_settings = octeon_mgmt_get_settings, - .set_settings = octeon_mgmt_set_settings, .nway_reset = octeon_mgmt_nway_reset, .get_link = ethtool_op_get_link, + .get_link_ksettings = phy_ethtool_get_link_ksettings, + .set_link_ksettings = phy_ethtool_set_link_ksettings, }; static const struct net_device_ops octeon_mgmt_ops = { |