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

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

net: microchip: encx24j600: use new api ethtool_{get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

As I don't have the hardware, I'd be very pleased if
someone may test this patch.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ff638e4

drivers/net/ethernet/microchip/encx24j600.c

+18 −14
Original line number Original line Diff line number Diff line
@@ -940,29 +940,33 @@ static void encx24j600_get_drvinfo(struct net_device *dev, 
		sizeof(info->bus_info));

		sizeof(info->bus_info));

}

}





static int encx24j600_get_settings(struct net_device *dev,

static int encx24j600_get_link_ksettings(struct net_device *dev,

				   struct ethtool_cmd *cmd)

					 struct ethtool_link_ksettings *cmd)

{

{

	struct encx24j600_priv *priv = netdev_priv(dev);

	struct encx24j600_priv *priv = netdev_priv(dev);

	u32 supported;





	cmd->transceiver = XCVR_INTERNAL;

	supported = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |

	cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full |

			 SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |

			 SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full |

			 SUPPORTED_Autoneg | SUPPORTED_TP;

			 SUPPORTED_Autoneg | SUPPORTED_TP;





	ethtool_cmd_speed_set(cmd, priv->speed);

	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,

	cmd->duplex = priv->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;

						supported);

	cmd->port = PORT_TP;



	cmd->autoneg = priv->autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;

	cmd->base.speed = priv->speed;

	cmd->base.duplex = priv->full_duplex ? DUPLEX_FULL : DUPLEX_HALF;

	cmd->base.port = PORT_TP;

	cmd->base.autoneg = priv->autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE;





	return 0;

	return 0;

}

}





static int encx24j600_set_settings(struct net_device *dev,

static int

				   struct ethtool_cmd *cmd)

encx24j600_set_link_ksettings(struct net_device *dev,

			      const struct ethtool_link_ksettings *cmd)

{

{

	return encx24j600_setlink(dev, cmd->autoneg,

	return encx24j600_setlink(dev, cmd->base.autoneg,

				  ethtool_cmd_speed(cmd), cmd->duplex);

				  cmd->base.speed, cmd->base.duplex);

}

}





static u32 encx24j600_get_msglevel(struct net_device *dev)

static u32 encx24j600_get_msglevel(struct net_device *dev)
@@ -980,13 +984,13 @@ static void encx24j600_set_msglevel(struct net_device *dev, u32 val) 
}

}





static const struct ethtool_ops encx24j600_ethtool_ops = {

static const struct ethtool_ops encx24j600_ethtool_ops = {

	.get_settings = encx24j600_get_settings,

	.set_settings = encx24j600_set_settings,

	.get_drvinfo = encx24j600_get_drvinfo,

	.get_drvinfo = encx24j600_get_drvinfo,

	.get_msglevel = encx24j600_get_msglevel,

	.get_msglevel = encx24j600_get_msglevel,

	.set_msglevel = encx24j600_set_msglevel,

	.set_msglevel = encx24j600_set_msglevel,

	.get_regs_len = encx24j600_get_regs_len,

	.get_regs_len = encx24j600_get_regs_len,

	.get_regs = encx24j600_get_regs,

	.get_regs = encx24j600_get_regs,

	.get_link_ksettings = encx24j600_get_link_ksettings,

	.set_link_ksettings = encx24j600_set_link_ksettings,

};

};





static const struct net_device_ops encx24j600_netdev_ops = {

static const struct net_device_ops encx24j600_netdev_ops = {