Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/724265/?format=api
{ "id": 724265, "url": "http://patchwork.ozlabs.org/api/patches/724265/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1486317344-20271-1-git-send-email-tremyfr@gmail.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1486317344-20271-1-git-send-email-tremyfr@gmail.com>", "list_archive_url": null, "date": "2017-02-05T17:55:44", "name": "net: intel: igb: use new api ethtool_{get|set}_link_ksettings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a54b338a47eebe7ccf93d148f8b739b252094421", "submitter": { "id": 65172, "url": "http://patchwork.ozlabs.org/api/people/65172/?format=api", "name": "Philippe Reynes", "email": "tremyfr@gmail.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1486317344-20271-1-git-send-email-tremyfr@gmail.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/724265/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/724265/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3vGdZ85fvkz9s3s\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 6 Feb 2017 04:56:00 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E30FA87522;\n\tSun, 5 Feb 2017 17:55:58 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id G5qzI3OnqEuU; Sun, 5 Feb 2017 17:55:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 924A88751C;\n\tSun, 5 Feb 2017 17:55:56 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id C8B651C0018\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSun, 5 Feb 2017 17:55:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C26A52E4DC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSun, 5 Feb 2017 17:55:54 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id TUCVLRl2PzwW for <intel-wired-lan@lists.osuosl.org>;\n\tSun, 5 Feb 2017 17:55:53 +0000 (UTC)", "from mail-wm0-f68.google.com (mail-wm0-f68.google.com\n\t[74.125.82.68])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 57C7126B53\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSun, 5 Feb 2017 17:55:53 +0000 (UTC)", "by mail-wm0-f68.google.com with SMTP id c85so17131381wmi.1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSun, 05 Feb 2017 09:55:53 -0800 (PST)", "from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net.\n\t[88.161.33.221]) by smtp.gmail.com with ESMTPSA id\n\t18sm55947367wrb.14.2017.02.05.09.55.49\n\t(version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSun, 05 Feb 2017 09:55:50 -0800 (PST)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"kh9ckPx8\"; dkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=NPbZUZDgJ78jQEf0u0884BdZ9S0RfRY2CY1GXnZgDrE=;\n\tb=kh9ckPx86AaoQoaKLwAxrokPEEwQxz6W53/o47xFNfqO58AQ2kCxFThfK8FASGgnIL\n\t1dxRK0AuWwULDrv4/gB9RexOgRBfuwuk02CFyZps9abmsg1AGA6leh63bD2zUkWhmG0P\n\t/v8IZvNj55Pwn/2kqvGIz6Hu779JWl+s3M0UhuDlwCKstCTx7LaKhxyQKqdGwHXajME8\n\tXg4fQy8bMnUCihZS4B6Czgs/mnxG1lT1i8GObDQqLF45q6e1esICFLLGY4wzBwXFsBmd\n\tAv/jdezUdN2UoptjDklgIUs6IL41YhI6FwSy1W9rA2M0U1r3okRcvkFFUayC+nxH3ciw\n\ttASQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=NPbZUZDgJ78jQEf0u0884BdZ9S0RfRY2CY1GXnZgDrE=;\n\tb=OYPf4qZEB6QSjyS00ftkAFlOgTCN7haQPZjZq/ISVYsGhFw5NX29iaPmswYDltAwl3\n\tBkhUjMJdYSiqrmR8KxKdiP4CPKthRcJfcf6+GDL120J5BGYjv5m/6PYXKhyVMqxvwREr\n\ts1Jm0O5ApbsdM25M6Nf6dqp6b8yxw1bVKJvCE1F60a/UQPFOsIkU2/PfohkuaPT4eTpQ\n\tvuXHElgfPipI3cGgg+q8Ls+Irm+2YV8msWxHlAzZGlGDISfcogtJA4LMXH8eaA0FCsUL\n\tRWDTSY99/q0Pt7qTMmAnGsuKn0Nr9267e5htBO2cAd+7+zCOgf5pcaGt4p+WzceBdesi\n\t9OpQ==", "X-Gm-Message-State": "AIkVDXJtyBK5LovLqN19bYZ9ufEIOdk6F9coDAXK5zQnN9VfnH9+R6jCacpzCFruev2EYw==", "X-Received": "by 10.223.145.163 with SMTP id 32mr7257116wri.198.1486317351614; \n\tSun, 05 Feb 2017 09:55:51 -0800 (PST)", "From": "Philippe Reynes <tremyfr@gmail.com>", "To": "jeffrey.t.kirsher@intel.com,\n\tdavem@davemloft.net", "Date": "Sun, 5 Feb 2017 18:55:44 +0100", "Message-Id": "<1486317344-20271-1-git-send-email-tremyfr@gmail.com>", "X-Mailer": "git-send-email 1.7.4.4", "Cc": "netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n\tlinux-kernel@vger.kernel.org, Philippe Reynes <tremyfr@gmail.com>", "Subject": "[Intel-wired-lan] [PATCH] net: intel: igb: use new api\n\tethtool_{get|set}_link_ksettings", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "The ethtool api {get|set}_settings is deprecated.\nWe move this driver to new api {get|set}_link_ksettings.\n\nAs I don't have the hardware, I'd be very pleased if\nsomeone may test this patch.\n\nSigned-off-by: Philippe Reynes <tremyfr@gmail.com>\n---\n drivers/net/ethernet/intel/igb/igb_ethtool.c | 108 ++++++++++++++------------\n 1 files changed, 59 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c\nindex 737b664..3e6281a 100644\n--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c\n+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c\n@@ -144,7 +144,8 @@ enum igb_diagnostics_results {\n };\n #define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN)\n \n-static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n+static int igb_get_link_ksettings(struct net_device *netdev,\n+\t\t\t\t struct ethtool_link_ksettings *cmd)\n {\n \tstruct igb_adapter *adapter = netdev_priv(netdev);\n \tstruct e1000_hw *hw = &adapter->hw;\n@@ -152,11 +153,12 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \tstruct e1000_sfp_flags *eth_flags = &dev_spec->eth_flags;\n \tu32 status;\n \tu32 speed;\n+\tu32 supported, advertising;\n \n \tstatus = rd32(E1000_STATUS);\n \tif (hw->phy.media_type == e1000_media_type_copper) {\n \n-\t\tecmd->supported = (SUPPORTED_10baseT_Half |\n+\t\tsupported = (SUPPORTED_10baseT_Half |\n \t\t\t\t SUPPORTED_10baseT_Full |\n \t\t\t\t SUPPORTED_100baseT_Half |\n \t\t\t\t SUPPORTED_100baseT_Full |\n@@ -164,63 +166,61 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \t\t\t\t SUPPORTED_Autoneg |\n \t\t\t\t SUPPORTED_TP |\n \t\t\t\t SUPPORTED_Pause);\n-\t\tecmd->advertising = ADVERTISED_TP;\n+\t\tadvertising = ADVERTISED_TP;\n \n \t\tif (hw->mac.autoneg == 1) {\n-\t\t\tecmd->advertising |= ADVERTISED_Autoneg;\n+\t\t\tadvertising |= ADVERTISED_Autoneg;\n \t\t\t/* the e1000 autoneg seems to match ethtool nicely */\n-\t\t\tecmd->advertising |= hw->phy.autoneg_advertised;\n+\t\t\tadvertising |= hw->phy.autoneg_advertised;\n \t\t}\n \n-\t\tecmd->port = PORT_TP;\n-\t\tecmd->phy_address = hw->phy.addr;\n-\t\tecmd->transceiver = XCVR_INTERNAL;\n+\t\tcmd->base.port = PORT_TP;\n+\t\tcmd->base.phy_address = hw->phy.addr;\n \t} else {\n-\t\tecmd->supported = (SUPPORTED_FIBRE |\n+\t\tsupported = (SUPPORTED_FIBRE |\n \t\t\t\t SUPPORTED_1000baseKX_Full |\n \t\t\t\t SUPPORTED_Autoneg |\n \t\t\t\t SUPPORTED_Pause);\n-\t\tecmd->advertising = (ADVERTISED_FIBRE |\n+\t\tadvertising = (ADVERTISED_FIBRE |\n \t\t\t\t ADVERTISED_1000baseKX_Full);\n \t\tif (hw->mac.type == e1000_i354) {\n \t\t\tif ((hw->device_id ==\n \t\t\t E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) &&\n \t\t\t !(status & E1000_STATUS_2P5_SKU_OVER)) {\n-\t\t\t\tecmd->supported |= SUPPORTED_2500baseX_Full;\n-\t\t\t\tecmd->supported &=\n+\t\t\t\tsupported |= SUPPORTED_2500baseX_Full;\n+\t\t\t\tsupported &=\n \t\t\t\t\t~SUPPORTED_1000baseKX_Full;\n-\t\t\t\tecmd->advertising |= ADVERTISED_2500baseX_Full;\n-\t\t\t\tecmd->advertising &=\n+\t\t\t\tadvertising |= ADVERTISED_2500baseX_Full;\n+\t\t\t\tadvertising &=\n \t\t\t\t\t~ADVERTISED_1000baseKX_Full;\n \t\t\t}\n \t\t}\n \t\tif (eth_flags->e100_base_fx) {\n-\t\t\tecmd->supported |= SUPPORTED_100baseT_Full;\n-\t\t\tecmd->advertising |= ADVERTISED_100baseT_Full;\n+\t\t\tsupported |= SUPPORTED_100baseT_Full;\n+\t\t\tadvertising |= ADVERTISED_100baseT_Full;\n \t\t}\n \t\tif (hw->mac.autoneg == 1)\n-\t\t\tecmd->advertising |= ADVERTISED_Autoneg;\n+\t\t\tadvertising |= ADVERTISED_Autoneg;\n \n-\t\tecmd->port = PORT_FIBRE;\n-\t\tecmd->transceiver = XCVR_EXTERNAL;\n+\t\tcmd->base.port = PORT_FIBRE;\n \t}\n \tif (hw->mac.autoneg != 1)\n-\t\tecmd->advertising &= ~(ADVERTISED_Pause |\n+\t\tadvertising &= ~(ADVERTISED_Pause |\n \t\t\t\t ADVERTISED_Asym_Pause);\n \n \tswitch (hw->fc.requested_mode) {\n \tcase e1000_fc_full:\n-\t\tecmd->advertising |= ADVERTISED_Pause;\n+\t\tadvertising |= ADVERTISED_Pause;\n \t\tbreak;\n \tcase e1000_fc_rx_pause:\n-\t\tecmd->advertising |= (ADVERTISED_Pause |\n+\t\tadvertising |= (ADVERTISED_Pause |\n \t\t\t\t ADVERTISED_Asym_Pause);\n \t\tbreak;\n \tcase e1000_fc_tx_pause:\n-\t\tecmd->advertising |= ADVERTISED_Asym_Pause;\n+\t\tadvertising |= ADVERTISED_Asym_Pause;\n \t\tbreak;\n \tdefault:\n-\t\tecmd->advertising &= ~(ADVERTISED_Pause |\n+\t\tadvertising &= ~(ADVERTISED_Pause |\n \t\t\t\t ADVERTISED_Asym_Pause);\n \t}\n \tif (status & E1000_STATUS_LU) {\n@@ -236,39 +236,46 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \t\t}\n \t\tif ((status & E1000_STATUS_FD) ||\n \t\t hw->phy.media_type != e1000_media_type_copper)\n-\t\t\tecmd->duplex = DUPLEX_FULL;\n+\t\t\tcmd->base.duplex = DUPLEX_FULL;\n \t\telse\n-\t\t\tecmd->duplex = DUPLEX_HALF;\n+\t\t\tcmd->base.duplex = DUPLEX_HALF;\n \t} else {\n \t\tspeed = SPEED_UNKNOWN;\n-\t\tecmd->duplex = DUPLEX_UNKNOWN;\n+\t\tcmd->base.duplex = DUPLEX_UNKNOWN;\n \t}\n-\tethtool_cmd_speed_set(ecmd, speed);\n+\tcmd->base.speed = speed;\n \tif ((hw->phy.media_type == e1000_media_type_fiber) ||\n \t hw->mac.autoneg)\n-\t\tecmd->autoneg = AUTONEG_ENABLE;\n+\t\tcmd->base.autoneg = AUTONEG_ENABLE;\n \telse\n-\t\tecmd->autoneg = AUTONEG_DISABLE;\n+\t\tcmd->base.autoneg = AUTONEG_DISABLE;\n \n \t/* MDI-X => 2; MDI =>1; Invalid =>0 */\n \tif (hw->phy.media_type == e1000_media_type_copper)\n-\t\tecmd->eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :\n+\t\tcmd->base.eth_tp_mdix = hw->phy.is_mdix ? ETH_TP_MDI_X :\n \t\t\t\t\t\t ETH_TP_MDI;\n \telse\n-\t\tecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;\n+\t\tcmd->base.eth_tp_mdix = ETH_TP_MDI_INVALID;\n \n \tif (hw->phy.mdix == AUTO_ALL_MODES)\n-\t\tecmd->eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO;\n+\t\tcmd->base.eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO;\n \telse\n-\t\tecmd->eth_tp_mdix_ctrl = hw->phy.mdix;\n+\t\tcmd->base.eth_tp_mdix_ctrl = hw->phy.mdix;\n+\n+\tethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,\n+\t\t\t\t\t\tsupported);\n+\tethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,\n+\t\t\t\t\t\tadvertising);\n \n \treturn 0;\n }\n \n-static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n+static int igb_set_link_ksettings(struct net_device *netdev,\n+\t\t\t\t const struct ethtool_link_ksettings *cmd)\n {\n \tstruct igb_adapter *adapter = netdev_priv(netdev);\n \tstruct e1000_hw *hw = &adapter->hw;\n+\tu32 advertising;\n \n \t/* When SoL/IDER sessions are active, autoneg/speed/duplex\n \t * cannot be changed\n@@ -283,12 +290,12 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \t * some hardware doesn't allow MDI setting when speed or\n \t * duplex is forced.\n \t */\n-\tif (ecmd->eth_tp_mdix_ctrl) {\n+\tif (cmd->base.eth_tp_mdix_ctrl) {\n \t\tif (hw->phy.media_type != e1000_media_type_copper)\n \t\t\treturn -EOPNOTSUPP;\n \n-\t\tif ((ecmd->eth_tp_mdix_ctrl != ETH_TP_MDI_AUTO) &&\n-\t\t (ecmd->autoneg != AUTONEG_ENABLE)) {\n+\t\tif ((cmd->base.eth_tp_mdix_ctrl != ETH_TP_MDI_AUTO) &&\n+\t\t (cmd->base.autoneg != AUTONEG_ENABLE)) {\n \t\t\tdev_err(&adapter->pdev->dev, \"forcing MDI/MDI-X state is not supported when link speed and/or duplex are forced\\n\");\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -297,10 +304,13 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \twhile (test_and_set_bit(__IGB_RESETTING, &adapter->state))\n \t\tusleep_range(1000, 2000);\n \n-\tif (ecmd->autoneg == AUTONEG_ENABLE) {\n+\tethtool_convert_link_mode_to_legacy_u32(&advertising,\n+\t\t\t\t\t\tcmd->link_modes.advertising);\n+\n+\tif (cmd->base.autoneg == AUTONEG_ENABLE) {\n \t\thw->mac.autoneg = 1;\n \t\tif (hw->phy.media_type == e1000_media_type_fiber) {\n-\t\t\thw->phy.autoneg_advertised = ecmd->advertising |\n+\t\t\thw->phy.autoneg_advertised = advertising |\n \t\t\t\t\t\t ADVERTISED_FIBRE |\n \t\t\t\t\t\t ADVERTISED_Autoneg;\n \t\t\tswitch (adapter->link_speed) {\n@@ -320,31 +330,31 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)\n \t\t\t\tbreak;\n \t\t\t}\n \t\t} else {\n-\t\t\thw->phy.autoneg_advertised = ecmd->advertising |\n+\t\t\thw->phy.autoneg_advertised = advertising |\n \t\t\t\t\t\t ADVERTISED_TP |\n \t\t\t\t\t\t ADVERTISED_Autoneg;\n \t\t}\n-\t\tecmd->advertising = hw->phy.autoneg_advertised;\n+\t\tadvertising = hw->phy.autoneg_advertised;\n \t\tif (adapter->fc_autoneg)\n \t\t\thw->fc.requested_mode = e1000_fc_default;\n \t} else {\n-\t\tu32 speed = ethtool_cmd_speed(ecmd);\n+\t\tu32 speed = cmd->base.speed;\n \t\t/* calling this overrides forced MDI setting */\n-\t\tif (igb_set_spd_dplx(adapter, speed, ecmd->duplex)) {\n+\t\tif (igb_set_spd_dplx(adapter, speed, cmd->base.duplex)) {\n \t\t\tclear_bit(__IGB_RESETTING, &adapter->state);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n \n \t/* MDI-X => 2; MDI => 1; Auto => 3 */\n-\tif (ecmd->eth_tp_mdix_ctrl) {\n+\tif (cmd->base.eth_tp_mdix_ctrl) {\n \t\t/* fix up the value for auto (3 => 0) as zero is mapped\n \t\t * internally to auto\n \t\t */\n-\t\tif (ecmd->eth_tp_mdix_ctrl == ETH_TP_MDI_AUTO)\n+\t\tif (cmd->base.eth_tp_mdix_ctrl == ETH_TP_MDI_AUTO)\n \t\t\thw->phy.mdix = AUTO_ALL_MODES;\n \t\telse\n-\t\t\thw->phy.mdix = ecmd->eth_tp_mdix_ctrl;\n+\t\t\thw->phy.mdix = cmd->base.eth_tp_mdix_ctrl;\n \t}\n \n \t/* reset the link */\n@@ -3389,8 +3399,6 @@ static int igb_set_channels(struct net_device *netdev,\n }\n \n static const struct ethtool_ops igb_ethtool_ops = {\n-\t.get_settings\t\t= igb_get_settings,\n-\t.set_settings\t\t= igb_set_settings,\n \t.get_drvinfo\t\t= igb_get_drvinfo,\n \t.get_regs_len\t\t= igb_get_regs_len,\n \t.get_regs\t\t= igb_get_regs,\n@@ -3428,6 +3436,8 @@ static int igb_set_channels(struct net_device *netdev,\n \t.set_channels\t\t= igb_set_channels,\n \t.begin\t\t\t= igb_ethtool_begin,\n \t.complete\t\t= igb_ethtool_complete,\n+\t.get_link_ksettings\t= igb_get_link_ksettings,\n+\t.set_link_ksettings\t= igb_set_link_ksettings,\n };\n \n void igb_set_ethtool_ops(struct net_device *netdev)\n", "prefixes": [] }