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

Commit de55b42d authored by Philippe Reynes's avatar Philippe Reynes Committed by Greg Kroah-Hartman
Browse files

net: ethernet: 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.

There was a check on CAP_NET_ADMIN in cvm_oct_set_settings, but this
check is already done in dev_ethtool, so no need to repeat it before
calling the generic function.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d99db13

drivers/staging/octeon/ethernet-mdio.c

+2 −21
Original line number Diff line number Diff line
@@ -34,25 +34,6 @@ static void cvm_oct_get_drvinfo(struct net_device *dev, 
	strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info));

}



static int cvm_oct_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	if (dev->phydev)

		return phy_ethtool_gset(dev->phydev, cmd);



	return -EINVAL;

}



static int cvm_oct_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	if (!capable(CAP_NET_ADMIN))

		return -EPERM;



	if (dev->phydev)

		return phy_ethtool_sset(dev->phydev, cmd);



	return -EINVAL;

}



static int cvm_oct_nway_reset(struct net_device *dev)

{

	if (!capable(CAP_NET_ADMIN))
@@ -66,10 +47,10 @@ static int cvm_oct_nway_reset(struct net_device *dev) 


const struct ethtool_ops cvm_oct_ethtool_ops = {

	.get_drvinfo = cvm_oct_get_drvinfo,

	.get_settings = cvm_oct_get_settings,

	.set_settings = cvm_oct_set_settings,

	.nway_reset = cvm_oct_nway_reset,

	.get_link = ethtool_op_get_link,

	.get_link_ksettings = phy_ethtool_get_link_ksettings,

	.set_link_ksettings = phy_ethtool_set_link_ksettings,

};



/**