Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1280358

[PATCH net-next v3 04/17] tx4939: use __ethtool_get_ksettings

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 arch/mips/txx9/generic/setup_tx4939.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index e3733cd..4a3ebf6 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
 #if IS_ENABLED(CONFIG_TC35815)
 static u32 tx4939_get_eth_speed(struct net_device *dev)
 {
-	struct ethtool_cmd cmd;
-	if (__ethtool_get_settings(dev, &cmd))
+	struct ethtool_ksettings cmd;
+
+	if (__ethtool_get_ksettings(dev, &cmd))
 		return 100;	/* default 100Mbps */
 
-	return ethtool_cmd_speed(&cmd);
+	return cmd.parent.speed;
 }
 
 static int tx4939_netdev_event(struct notifier_block *this,
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next v3 00/17] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 11/17] net: rdma: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 12/17] net: 8021q: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 14/17] net: core: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 13/17] net: bridge: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 01/17] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 08/17] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 07/17] net: ipvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 02/17] net: usnic: use __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 05/17] net: usnic: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 06/17] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 10/17] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 04/17] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
    Re: [PATCH net-next v3 04/17] tx4939: use __ethtool_get_ksettings Ralf Baechle <ralf@linux-mips.org> - 2015-12-01 01:00 +0100
  [PATCH net-next v3 09/17] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API Ben Hutchings <ben@decadent.org.uk> - 2015-12-01 03:00 +0100
  Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Miller <davem@davemloft.net> - 2015-12-02 04:20 +0100
    Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-02 07:10 +0100
      Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Miller <davem@davemloft.net> - 2015-12-02 18:40 +0100

csiph-web