Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1312623
| 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 12/19] net: fcoe: use __ethtool_get_ksettings |
| Date | Wed, 20 Jan 2016 01:50:05 +0100 |
| Message-ID | <qSP8h-73P-97@gated-at.bofh.it> (permalink) |
| References | <qSP8d-73P-5@gated-at.bofh.it> |
| 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=EavHrjc2HwEPbHOa3N4yzK1CX7dCZK5nkbrXOfu5vOw=; b=KfJbQ1jSghxFOVFwjAyjJPoymSD2Kf477DjoDDjOrJ7jflDecVFzb8vTdHKDxj67Po NcqTG0tPI3BHC8riK1EHSPnNAv/bqE4Z4Zyb5eO4Si+qxInjXSsrN5Ucojgynmr+6ngB iZaI6e9E/SZ7k/BX3P1xYOmUsRMyzCdD2CXMhgqeu982H9wvVJigVEhqGoH5jsN7qteo vfS/ek9F5OzS9BisPDPsOhRZrVxZMPIqn+Tt5xs0qhpTewKE8XhyV/Bxi0P0MpwtWxJG 4vEzfWSINWec4xRw07rWK0ST3/y3Lup4lthJRk3fJ5xBhnlCz9MmKcW6mkpYARQZ0j4i uelA== |
| 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=EavHrjc2HwEPbHOa3N4yzK1CX7dCZK5nkbrXOfu5vOw=; b=ltGWU7uAMj6AP36PzQIv8sl1B7vYifKPw+jWsKIGNnenBEnHMY9uFlR/VAw5p0blgD ME46xyMnE2rO79dT/wIjfka4LJ2wgFoDCVg1eZS53F697zOy1xu/zlwZ5cAWlB4FntGL 0qNGBQejMT4vfzX+ciLmdDS863C4tH9KchLsn/gNcz9NZQqYscOuZWvt+Gbqr3wmQQh9 +uvITTTIzXT2ZksZRdUVeoowYcJA/CAbumjGbqnRbH3ffIbnnWoiLMj6TrWtkM/qH+U5 adrQXnXtyG5ETDEA0PMLcCjMIqCWInk1ezKYKQTdMsQdydJ6KqhtPMEMNxwx7zbMPrwJ Ibdg== |
| X-Gm-Message-State | ALoCoQm1RE6m1wXfEvzJIEZ9sQ/QKNnC6tec5aFbqX00S8bPuLIhbHaemHd7eUgi5UqdBedd+VGQz21T8bEok+cTQRx5C9AW7w== |
| X-Received | by 10.98.16.139 with SMTP id 11mr48615142pfq.128.1453250662445; Tue, 19 Jan 2016 16:44:22 -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 | 70 |
| 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:57 -0800 |
| X-Original-Message-ID | <1453250644-14796-13-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:1312623 |
Show key headers only | View raw
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 d7597c0..2d5909f 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[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[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[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[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.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next v6 00/19] new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 14/19] net: 8021q: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 10/19] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 08/19] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 02:00 +0100
csiph-web