From patchwork Wed Feb 10 00:29:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 581255 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D65EC140082 for ; Wed, 10 Feb 2016 11:34:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ceLESC2Q; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757121AbcBJAeD (ORCPT ); Tue, 9 Feb 2016 19:34:03 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35908 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932185AbcBJAaH (ORCPT ); Tue, 9 Feb 2016 19:30:07 -0500 Received: by mail-pf0-f193.google.com with SMTP id e127so170645pfe.3; Tue, 09 Feb 2016 16:30:07 -0800 (PST) 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=Nv/955mO7QOUjayIAkpnofasbr4YawAVZD1TtTr4WYo=; b=ceLESC2QxeGuF9KCycDnyjdnB1Zg++lrnjQG6fgx9xhVAFLkycggSxzrlG84k8K8GJ MbnO+3mPI3aRz5eHLx3X40QwbW03vaagMbZn11lGn4+kFd2M5Aj29zVwAJgmtEsH2QTq OrITVIZrcHQFbugC6AhJfD2EfE2BkpBiozL5awgZ+hazSLTnDHlDdkjBmxhoBonSQs8j T/bimWQM9pnIpK0Vq/jlQYN0QzyT+zIj6tJ0bLey9oLn2T5h75C3nynjx+KhD4KIZlra 4cvH4zgRAGeCGof8aZ6rVF+Rl70xg8Gr3Zk285UDijkJh8264pi0DuBJSneCavF2edMa T2kg== 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=Nv/955mO7QOUjayIAkpnofasbr4YawAVZD1TtTr4WYo=; b=Nee/UmXmWwhDbwbQsDJmfo4p2UcI5my6W+/5ym8NUoaWitStg+kIezL4YmmsvxIPnS a1NbKUtjzZdLhMm29D3x4PzzwUQnVzNPkjdWTQK6j97vVkBio7pTToj2Tc80rFDWIzfO u7GLjgZSNkpuUXNWoz9xNtFms4jdDjcxkKBr73Bf5Wrd5xUvy9ZwUWE22qgw9hkblgI6 WG0mPhxWawspQ9dZ5r2VUc8haj5ZNVCHgpzxOOd1SDuN5Pa4svjMiwk96vg2ccPzVnja HwKgWxXQGiB2KTsdhaSNVbAJ8Mn6LEV9Vj3WkYadW89KgcyBolyfNh8WI9eHnT2HcqxC XIYQ== X-Gm-Message-State: AG10YOSteVso4S3SJnXKr+zn+71erIABHsK+j/dxpsd91yQK8qMAzevr6QAQlHMjgEfWlw== X-Received: by 10.98.66.138 with SMTP id h10mr55350461pfd.89.1455064206803; Tue, 09 Feb 2016 16:30:06 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by smtp.gmail.com with ESMTPSA id s90sm429295pfa.49.2016.02.09.16.30.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Feb 2016 16:30:04 -0800 (PST) From: David Decotigny To: "David S. Miller" , Ben Hutchings , 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 , Tejun Heo Cc: Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Pravin B Shelar , Ed Swierk , Robert Love , "James E.J. Bottomley" , Yuval Mintz , Rasmus Villemoes , David Decotigny Subject: [PATCH net-next v8 11/19] net: team: use __ethtool_get_ksettings Date: Tue, 9 Feb 2016 16:29:20 -0800 Message-Id: <1455064168-5102-12-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1455064168-5102-1-git-send-email-ddecotig@gmail.com> References: <1455064168-5102-1-git-send-email-ddecotig@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Decotigny Signed-off-by: David Decotigny --- 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 00558e1..7f96eca7 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2813,12 +2813,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; } }