diff options
| author |   Philippe Reynes <tremyfr@gmail.com> | 2016-09-26 22:31:55 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-09-27 07:43:07 -0400 |
| commit | 62c8d3daada97dab481a8235f39f2283daf5c8ba (patch) | |
| tree | 209ee3bcf2ce4d216c48d90344ab63425635b858 /drivers/net/ethernet/broadcom | |
| parent | bpf: Set register type according to is_valid_access() (diff) | |
| download | linux-dev-62c8d3daada97dab481a8235f39f2283daf5c8ba.tar.xz linux-dev-62c8d3daada97dab481a8235f39f2283daf5c8ba.zip | |
Revert "net: ethernet: bcmgenet: use new api ethtool_{get|set}_link_ksettings"
This reverts commit 6b352ebccbcf ("net: ethernet: broadcom: bcmgenet:
use new api ethtool_{get|set}_link_ksettings").
We needs to revert the commit 62469c76007e ("net: ethernet: bcmgenet:
use phydev from struct net_device"), because this commit add a
regression. As the commit 6b352ebccbcf ("net: ethernet: broadcom:
bcmgenet: use new api ethtool_{get|set}_link_ksettings") depend
on the first one, we also need to revert it first.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 7f478499b649..6d6f83b20654 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -450,8 +450,8 @@ static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv, genet_dma_ring_regs[r]); } -static int bcmgenet_get_link_ksettings(struct net_device *dev, - struct ethtool_link_ksettings *cmd) +static int bcmgenet_get_settings(struct net_device *dev, + struct ethtool_cmd *cmd) { if (!netif_running(dev)) return -EINVAL; @@ -459,11 +459,11 @@ static int bcmgenet_get_link_ksettings(struct net_device *dev, if (!dev->phydev) return -ENODEV; - return phy_ethtool_ksettings_get(dev->phydev, cmd); + return phy_ethtool_gset(dev->phydev, cmd); } -static int bcmgenet_set_link_ksettings(struct net_device *dev, - const struct ethtool_link_ksettings *cmd) +static int bcmgenet_set_settings(struct net_device *dev, + struct ethtool_cmd *cmd) { if (!netif_running(dev)) return -EINVAL; @@ -471,7 +471,7 @@ static int bcmgenet_set_link_ksettings(struct net_device *dev, if (!dev->phydev) return -ENODEV; - return phy_ethtool_ksettings_set(dev->phydev, cmd); + return phy_ethtool_sset(dev->phydev, cmd); } static int bcmgenet_set_rx_csum(struct net_device *dev, @@ -977,6 +977,8 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = { .get_strings = bcmgenet_get_strings, .get_sset_count = bcmgenet_get_sset_count, .get_ethtool_stats = bcmgenet_get_ethtool_stats, + .get_settings = bcmgenet_get_settings, + .set_settings = bcmgenet_set_settings, .get_drvinfo = bcmgenet_get_drvinfo, .get_link = ethtool_op_get_link, .get_msglevel = bcmgenet_get_msglevel, @@ -988,8 +990,6 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = { .nway_reset = bcmgenet_nway_reset, .get_coalesce = bcmgenet_get_coalesce, .set_coalesce = bcmgenet_set_coalesce, - .get_link_ksettings = bcmgenet_get_link_ksettings, - .set_link_ksettings = bcmgenet_set_link_ksettings, }; /* Power down the unimac, based on mode. */ |