|
@@ -570,19 +570,21 @@ static void dm9000_set_msglevel(struct net_device *dev, u32 value)
|
|
|
dm->msg_enable = value;
|
|
|
}
|
|
|
|
|
|
-static int dm9000_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int dm9000_get_link_ksettings(struct net_device *dev,
|
|
|
+ struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct board_info *dm = to_dm9000_board(dev);
|
|
|
|
|
|
- mii_ethtool_gset(&dm->mii, cmd);
|
|
|
+ mii_ethtool_get_link_ksettings(&dm->mii, cmd);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int dm9000_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
+static int dm9000_set_link_ksettings(struct net_device *dev,
|
|
|
+ const struct ethtool_link_ksettings *cmd)
|
|
|
{
|
|
|
struct board_info *dm = to_dm9000_board(dev);
|
|
|
|
|
|
- return mii_ethtool_sset(&dm->mii, cmd);
|
|
|
+ return mii_ethtool_set_link_ksettings(&dm->mii, cmd);
|
|
|
}
|
|
|
|
|
|
static int dm9000_nway_reset(struct net_device *dev)
|
|
@@ -741,8 +743,6 @@ static int dm9000_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
|
|
|
|
|
|
static const struct ethtool_ops dm9000_ethtool_ops = {
|
|
|
.get_drvinfo = dm9000_get_drvinfo,
|
|
|
- .get_settings = dm9000_get_settings,
|
|
|
- .set_settings = dm9000_set_settings,
|
|
|
.get_msglevel = dm9000_get_msglevel,
|
|
|
.set_msglevel = dm9000_set_msglevel,
|
|
|
.nway_reset = dm9000_nway_reset,
|
|
@@ -752,6 +752,8 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
|
|
|
.get_eeprom_len = dm9000_get_eeprom_len,
|
|
|
.get_eeprom = dm9000_get_eeprom,
|
|
|
.set_eeprom = dm9000_set_eeprom,
|
|
|
+ .get_link_ksettings = dm9000_get_link_ksettings,
|
|
|
+ .set_link_ksettings = dm9000_set_link_ksettings,
|
|
|
};
|
|
|
|
|
|
static void dm9000_show_carrier(struct board_info *db,
|