From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 30 Nov 2015 23:08:12 +0100 (CET) Received: from mail-pa0-f66.google.com ([209.85.220.66]:33303 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27008035AbbK3WGeEUG0Y (ORCPT ); Mon, 30 Nov 2015 23:06:34 +0100 Received: by pagj16 with SMTP id j16so26828262pag.0 for ; Mon, 30 Nov 2015 14:06:26 -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=rlKDMELQKBJ2WIFXfe3NzarClNi3x/uZa0J/iVy1TSo=; b=ptQOy59YGRN6t857vAj7/Vtyijb1UFjBs52bxUb/xFdf2TfVUA/AGbmyaeJlNC3aX/ l2hcikLvxEQI2i3wY+DFzOj/SrFFvFH5tx1JFL/90HCO57vwsmTLyxXvsEPRRh4JQqGI 2j/UD5mKHaGyW4P6kDwHMZMpQnnhwadPwq6RwRGCrEuemztDZ0Nw9gfjpofcQ382NmMH DRiHAC4jpLk1Rsruwv4inTfLxUaiqRLhW2/m6BrLIpUBgB/XQtUsWaXxsbKvcLCBU9S8 IMJm4mlRa27K2Syr3ARxgJwvsay5Qq5EbhUP4Gb55s/lR6Jc9eG65X+ZR2Z/tO3TZlHG CnNw== X-Received: by 10.98.65.206 with SMTP id g75mr74557182pfd.105.1448921186865; Mon, 30 Nov 2015 14:06:26 -0800 (PST) Received: from decotigny.mtv.corp.google.com ([172.18.64.159]) by smtp.gmail.com with ESMTPSA id p6sm53253789pfi.20.2015.11.30.14.06.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Nov 2015 14:06:26 -0800 (PST) From: David Decotigny To: "David S. Miller" , Ben Hutchings , Amir Vadai , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org Cc: Eric Dumazet , Eugenia Emantayev , Or Gerlitz , Ido Shamay , Joe Perches , Saeed Mahameed , Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru , Jeff Kirsher , Eyal Perry , Pravin B Shelar , Ed Swierk , Robert Love , "James E.J. Bottomley" , Yuval Mintz , David Decotigny Subject: [PATCH net-next v3 06/17] net: bonding: use __ethtool_get_ksettings Date: Mon, 30 Nov 2015 14:05:44 -0800 Message-Id: <1448921155-24764-7-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1448921155-24764-1-git-send-email-ddecotig@gmail.com> References: <1448921155-24764-1-git-send-email-ddecotig@gmail.com> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 50228 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ddecotig@gmail.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips From: David Decotigny Signed-off-by: David Decotigny --- drivers/net/bonding/bond_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9e0f8a7..67d724d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -374,22 +374,20 @@ down: static void bond_update_speed_duplex(struct slave *slave) { struct net_device *slave_dev = slave->dev; - struct ethtool_cmd ecmd; - u32 slave_speed; + struct ethtool_ksettings ecmd; int res; slave->speed = SPEED_UNKNOWN; slave->duplex = DUPLEX_UNKNOWN; - res = __ethtool_get_settings(slave_dev, &ecmd); + res = __ethtool_get_ksettings(slave_dev, &ecmd); if (res < 0) return; - slave_speed = ethtool_cmd_speed(&ecmd); - if (slave_speed == 0 || slave_speed == ((__u32) -1)) + if (ecmd.parent.speed == 0 || ecmd.parent.speed == ((__u32)-1)) return; - switch (ecmd.duplex) { + switch (ecmd.parent.duplex) { case DUPLEX_FULL: case DUPLEX_HALF: break; @@ -397,8 +395,8 @@ static void bond_update_speed_duplex(struct slave *slave) return; } - slave->speed = slave_speed; - slave->duplex = ecmd.duplex; + slave->speed = ecmd.parent.speed; + slave->duplex = ecmd.parent.duplex; return; } -- 2.6.0.rc2.230.g3dd15c0