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

Groups > linux.kernel > #1287725

[PATCH net-next v4 11/19] net: team: use __ethtool_get_ksettings

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 drivers/net/team/team.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 059c0f6..7cc98a7 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2799,12 +2799,12 @@ static void __team_port_change_send(struct team_port *port, bool linkup)
 	port->state.linkup = linkup;
 	team_refresh_port_linkup(port);
 	if (linkup) {
-		struct ethtool_cmd ecmd;
+		struct ethtool_ksettings ecmd;
 
-		err = __ethtool_get_settings(port->dev, &ecmd);
+		err = __ethtool_get_ksettings(port->dev, &ecmd);
 		if (!err) {
-			port->state.speed = ethtool_cmd_speed(&ecmd);
-			port->state.duplex = ecmd.duplex;
+			port->state.speed = ecmd.parent.speed;
+			port->state.duplex = ecmd.parent.duplex;
 			goto send_event;
 		}
 	}
-- 
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 | Find similar | Unroll thread

Thread

[PATCH net-next v4 00/19] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 18/19] net: mlx4: convenience predicate for debug messages David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 02/19] test_bitmap: unit tests for lib/bitmap.c David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100
  [PATCH net-next v4 09/19] net: ipvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 08/19] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 13/19] net: rdma: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 06/19] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 07/19] net: usnic: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
    Re: [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings kbuild test robot <lkp@intel.com> - 2015-12-09 20:20 +0100
      Re: [PATCH net-next v4 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-10 05:10 +0100
  [PATCH net-next v4 01/19] lib/bitmap.c: conversion routines to/from u32 array David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 10/19] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 04/19] net: usnic: use __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 17/19] net: ethtool: remove unused __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 16/19] net: core: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 19/19] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100
  [PATCH net-next v4 11/19] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:20 +0100

csiph-web