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


Groups > linux.kernel > #1312607

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

Path csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From David Decotigny <ddecotig@gmail.com>
Newsgroups linux.kernel
Subject [PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings
Date Wed, 20 Jan 2016 01:50:02 +0100
Message-ID <qSP8e-73P-19@gated-at.bofh.it> (permalink)
References <qSP8d-73P-5@gated-at.bofh.it>
X-Original-To "David S. Miller" <davem@davemloft.net>, Ben Hutchings <ben@decadent.org.uk>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org, Andrew Morton <akpm@linux-foundation.org>, Tejun Heo <tj@kernel.org>
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cz2REAAVDgXwJyHnX4QtPFLZyCK+OObFzyr+4a3dUe8=; b=FfGBKsY8Sj/ajuyYG2/LwDG/rWZ40sDeLIJgkSjP5BawyRn/yEDORXg27pUPuQouvF r3nqTdkT4qP8ZsfvI1oCT2UdRghRyh7fPMKyXn6fn0E/NvOvhnGy5GV5WZOzccHmCxSI V2kVxRgh/ePZSGKQyojGEblKfk4KujkUbJnU7VRzRji/CcFl6c+B5PHkFfGozVyTP3Z2 tf1OJKDeZRx7gbz0Ir0DJU3qS8+6I07rgBaVbzOmtnk7lWMMffeHp8qFP7oGN4tv43Bu SSNagWWb9ydkMenNR6i/0lP+3ZTzMRjhIPcYvSkOSmTMbTK3+ymRC/V8Ys4Z2+BUDCve Khyg==
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cz2REAAVDgXwJyHnX4QtPFLZyCK+OObFzyr+4a3dUe8=; b=VPorQxbf/C9UllaYE4ptqxzxx1WV5g1xt8SVH1p2oO6R/yMrqMyDY6WecBtm+4O2yE D4zKt2maUo57x12RJ5Iu1LAjCJY0jE6su5izsD25qENxbtB6i9ZcdoOetEUBXVaEORM/ ILQNPrM9o/1u7ztfABA95HJq0a9R1D9AXQglt/8nHgFZmSTdIG4XesaVI8ESSszMqqFF G4ndNrf7ruL3qa2o+p+02oaNh6ja/wKUD7T0DPwMkJV+3I82Bspq0Xa3etFpTrc/tinf 63Ey05Pjf4mSODcWmv2295UG6J8vSx0aHYYA8K048lhN4fR134oyk3iZ/b++y95xlh1n H0xQ==
X-Gm-Message-State ALoCoQlf9g0CUws7C90LrKbpV55BO0u0hzmrtnv0MzB7rCDzU1O4z9YLdHScUl+xFB9ShKGMWvAuYlb185YIFDmb+c6CMknL7w==
X-Received by 10.66.63.104 with SMTP id f8mr48815522pas.41.1453250661285; Tue, 19 Jan 2016 16:44:21 -0800 (PST)
X-Mailer git-send-email 2.7.0.rc3.207.g0ac5344
Sender robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 30
Organization linux.* mail to news gateway
X-Original-Cc Eric Dumazet <edumazet@google.com>, Eugenia Emantayev <eugenia@mellanox.co.il>, Or Gerlitz <ogerlitz@mellanox.com>, Ido Shamay <idos@mellanox.com>, Joe Perches <joe@perches.com>, Saeed Mahameed <saeedm@mellanox.com>, Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru <VenkatKumar.Duvvuru@Emulex.Com>, Jeff Kirsher <jeffrey.t.kirsher@intel.com>, Pravin B Shelar <pshelar@nicira.com>, Ed Swierk <eswierk@skyportsystems.com>, Robert Love <robert.w.love@intel.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, Yuval Mintz <Yuval.Mintz@qlogic.com>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, David Decotigny <decot@googlers.com>
X-Original-Date Tue, 19 Jan 2016 16:43:56 -0800
X-Original-Message-ID <1453250644-14796-12-git-send-email-ddecotig@gmail.com>
X-Original-References <1453250644-14796-1-git-send-email-ddecotig@gmail.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1312607

Show key headers only | 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 2528331..9eac51d 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2809,12 +2809,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.7.0.rc3.207.g0ac5344

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


Thread

[PATCH net-next v6 11/19] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100

csiph-web