Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4400ded authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

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: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e8e6e88

drivers/net/ethernet/cavium/octeon/octeon_mgmt.c

+2 −23
Original line number Diff line number Diff line
@@ -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 = {