linux-mips
[Top] [All Lists]

[PATCH net-next v2 10/17] net: fcoe: use __ethtool_get_ksettings

To: "David S. Miller" <davem@davemloft.net>, Ben Hutchings <ben@decadent.org.uk>, Amir Vadai <amirv@mellanox.com>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org
Subject: [PATCH net-next v2 10/17] net: fcoe: use __ethtool_get_ksettings
From: David Decotigny <ddecotig@gmail.com>
Date: Wed, 4 Feb 2015 11:53:34 -0800
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>, Eyal Perry <eyalpe@mellanox.com>, Pravin B Shelar <pshelar@nicira.com>, Ed Swierk <eswierk@skyportsystems.com>, Upinder Malhi <umalhi@cisco.com>, Robert Love <robert.w.love@intel.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, David Decotigny <decot@googlers.com>
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=YtLRvAROqb+0aj1Das+Yax9wGFW26NuQkhU1iP8/pIo=; b=sGT7/gM53eapIcqQcDZuDZzCmvBtIYdbsanXfaAwXvHOKYNhszddRHfPVkaq9Py7Uv uVEMXF8KuWW4/4MjGftYyUZ/AjhZ8jtgMMvKCzlph8sLwh0968U9C0BsbVxR0StnsEni 7NEhugCZj6pet4rnz4s/aTLrYUeR8tbv3sKMLyBNo1zTLpZ5/hNW+HDfWO/At/gr0boO Lw9Uj62UtqMcAhSKqJdMto+7feo4zFYRxUP+McsKY+SVV5M9Q5b8ailOUp247Q3JJUWC necnHk+LRORwydtkyzzMK0PW14QCpuCX1SMfZkbD7XWJwh9n+397+vcfqdKD7VFADrGe Wlug==
In-reply-to: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 drivers/scsi/fcoe/fcoe_transport.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/fcoe/fcoe_transport.c 
b/drivers/scsi/fcoe/fcoe_transport.c
index bdc8989..6097f0d 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -93,36 +93,40 @@ static struct notifier_block libfcoe_notifier = {
 int fcoe_link_speed_update(struct fc_lport *lport)
 {
        struct net_device *netdev = fcoe_get_netdev(lport);
-       struct ethtool_cmd ecmd;
+       struct ethtool_ksettings ecmd;
 
-       if (!__ethtool_get_settings(netdev, &ecmd)) {
+       if (!__ethtool_get_ksettings(netdev, &ecmd)) {
                lport->link_supported_speeds &= ~(FC_PORTSPEED_1GBIT  |
                                                  FC_PORTSPEED_10GBIT |
                                                  FC_PORTSPEED_20GBIT |
                                                  FC_PORTSPEED_40GBIT);
 
-               if (ecmd.supported & (SUPPORTED_1000baseT_Half |
-                                     SUPPORTED_1000baseT_Full |
-                                     SUPPORTED_1000baseKX_Full))
+               if (ecmd.link_modes.supported.mask[0] & (
+                           SUPPORTED_1000baseT_Half |
+                           SUPPORTED_1000baseT_Full |
+                           SUPPORTED_1000baseKX_Full))
                        lport->link_supported_speeds |= FC_PORTSPEED_1GBIT;
 
-               if (ecmd.supported & (SUPPORTED_10000baseT_Full   |
-                                     SUPPORTED_10000baseKX4_Full |
-                                     SUPPORTED_10000baseKR_Full  |
-                                     SUPPORTED_10000baseR_FEC))
+               if (ecmd.link_modes.supported.mask[0] & (
+                           SUPPORTED_10000baseT_Full   |
+                           SUPPORTED_10000baseKX4_Full |
+                           SUPPORTED_10000baseKR_Full  |
+                           SUPPORTED_10000baseR_FEC))
                        lport->link_supported_speeds |= FC_PORTSPEED_10GBIT;
 
-               if (ecmd.supported & (SUPPORTED_20000baseMLD2_Full |
-                                     SUPPORTED_20000baseKR2_Full))
+               if (ecmd.link_modes.supported.mask[0] & (
+                           SUPPORTED_20000baseMLD2_Full |
+                           SUPPORTED_20000baseKR2_Full))
                        lport->link_supported_speeds |= FC_PORTSPEED_20GBIT;
 
-               if (ecmd.supported & (SUPPORTED_40000baseKR4_Full |
-                                     SUPPORTED_40000baseCR4_Full |
-                                     SUPPORTED_40000baseSR4_Full |
-                                     SUPPORTED_40000baseLR4_Full))
+               if (ecmd.link_modes.supported.mask[0] & (
+                           SUPPORTED_40000baseKR4_Full |
+                           SUPPORTED_40000baseCR4_Full |
+                           SUPPORTED_40000baseSR4_Full |
+                           SUPPORTED_40000baseLR4_Full))
                        lport->link_supported_speeds |= FC_PORTSPEED_40GBIT;
 
-               switch (ethtool_cmd_speed(&ecmd)) {
+               switch (ecmd.parent.speed) {
                case SPEED_1000:
                        lport->link_speed = FC_PORTSPEED_1GBIT;
                        break;
-- 
2.2.0.rc0.207.ga3a616c


<Prev in Thread] Current Thread [Next in Thread>