aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igbvf/ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/igbvf/ethtool.c')
-rw-r--r--drivers/net/igbvf/ethtool.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index 1d943aa7c7a..b0b14d63dfb 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -90,18 +90,18 @@ static int igbvf_get_settings(struct net_device *netdev,
90 status = er32(STATUS); 90 status = er32(STATUS);
91 if (status & E1000_STATUS_LU) { 91 if (status & E1000_STATUS_LU) {
92 if (status & E1000_STATUS_SPEED_1000) 92 if (status & E1000_STATUS_SPEED_1000)
93 ecmd->speed = 1000; 93 ethtool_cmd_speed_set(ecmd, SPEED_1000);
94 else if (status & E1000_STATUS_SPEED_100) 94 else if (status & E1000_STATUS_SPEED_100)
95 ecmd->speed = 100; 95 ethtool_cmd_speed_set(ecmd, SPEED_100);
96 else 96 else
97 ecmd->speed = 10; 97 ethtool_cmd_speed_set(ecmd, SPEED_10);
98 98
99 if (status & E1000_STATUS_FD) 99 if (status & E1000_STATUS_FD)
100 ecmd->duplex = DUPLEX_FULL; 100 ecmd->duplex = DUPLEX_FULL;
101 else 101 else
102 ecmd->duplex = DUPLEX_HALF; 102 ecmd->duplex = DUPLEX_HALF;
103 } else { 103 } else {
104 ecmd->speed = -1; 104 ethtool_cmd_speed_set(ecmd, -1);
105 ecmd->duplex = -1; 105 ecmd->duplex = -1;
106 } 106 }
107 107
@@ -391,11 +391,6 @@ static int igbvf_set_wol(struct net_device *netdev,
391 return -EOPNOTSUPP; 391 return -EOPNOTSUPP;
392} 392}
393 393
394static int igbvf_phys_id(struct net_device *netdev, u32 data)
395{
396 return 0;
397}
398
399static int igbvf_get_coalesce(struct net_device *netdev, 394static int igbvf_get_coalesce(struct net_device *netdev,
400 struct ethtool_coalesce *ec) 395 struct ethtool_coalesce *ec)
401{ 396{
@@ -527,7 +522,6 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
527 .self_test = igbvf_diag_test, 522 .self_test = igbvf_diag_test,
528 .get_sset_count = igbvf_get_sset_count, 523 .get_sset_count = igbvf_get_sset_count,
529 .get_strings = igbvf_get_strings, 524 .get_strings = igbvf_get_strings,
530 .phys_id = igbvf_phys_id,
531 .get_ethtool_stats = igbvf_get_ethtool_stats, 525 .get_ethtool_stats = igbvf_get_ethtool_stats,
532 .get_coalesce = igbvf_get_coalesce, 526 .get_coalesce = igbvf_get_coalesce,
533 .set_coalesce = igbvf_set_coalesce, 527 .set_coalesce = igbvf_set_coalesce,