Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/523554/?format=api
{ "id": 523554, "url": "http://patchwork.ozlabs.org/api/patches/523554/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1443464220-148318-10-git-send-email-catherine.sullivan@intel.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": "<1443464220-148318-10-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-09-28T18:16:58", "name": "[next,S17,09/11] i40e: Fix order of checks when enabling/disabling autoneg in ethtool", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8952908e6dceeb7e4cc520cc70f4484e114189be", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@intel.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/1443464220-148318-10-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/523554/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/523554/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\tby ozlabs.org (Postfix) with ESMTP id 413121400B7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Sep 2015 04:17:43 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5FFE1921E7;\n\tMon, 28 Sep 2015 18:17:42 +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 0zYhoczQOPuX; Mon, 28 Sep 2015 18:17:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0A1D292205;\n\tMon, 28 Sep 2015 18:17:36 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id ABC121C1591\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:17:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A74CC94D90\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:17:34 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 4DU8uKqjoQdr for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:17:34 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5520294E49\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Sep 2015 18:17:34 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 28 Sep 2015 11:17:11 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga002.jf.intel.com with ESMTP; 28 Sep 2015 11:17:11 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.17,604,1437462000\"; d=\"scan'208\";a=\"814862685\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 28 Sep 2015 14:16:58 -0400", "Message-Id": "<1443464220-148318-10-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1443464220-148318-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1443464220-148318-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S17 09/11] i40e: Fix order of checks\n\twhen enabling/disabling autoneg in ethtool", "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": "We were previously checking if autoneg was allowed to change before\nchecking if autoneg was changing. We need to do this in the other order\nor else we will erroneously return EINVAL when autoneg is not changing.\n\nSigned-off-by: Catherine Sullivan <catherine.sullivan@intel.com>\nChange-ID: Iff9f7d1c9bddc1ad1e5d227d4f42754f90155410\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 29 ++++++++++++++------------\n 1 file changed, 16 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex d196e0b..fcbe719 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -661,28 +661,31 @@ static int i40e_set_settings(struct net_device *netdev,\n \n \t/* Check autoneg */\n \tif (autoneg == AUTONEG_ENABLE) {\n-\t\t/* If autoneg is not supported, return error */\n-\t\tif (!(safe_ecmd.supported & SUPPORTED_Autoneg)) {\n-\t\t\tnetdev_info(netdev, \"Autoneg not supported on this phy\\n\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n \t\t/* If autoneg was not already enabled */\n \t\tif (!(hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED)) {\n+\t\t\t/* If autoneg is not supported, return error */\n+\t\t\tif (!(safe_ecmd.supported & SUPPORTED_Autoneg)) {\n+\t\t\t\tnetdev_info(netdev, \"Autoneg not supported on this phy\\n\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\t/* Autoneg is allowed to change */\n \t\t\tconfig.abilities = abilities.abilities |\n \t\t\t\t\t I40E_AQ_PHY_ENABLE_AN;\n \t\t\tchange = true;\n \t\t}\n \t} else {\n-\t\t/* If autoneg is supported 10GBASE_T is the only phy that\n-\t\t * can disable it, so otherwise return error\n-\t\t */\n-\t\tif (safe_ecmd.supported & SUPPORTED_Autoneg &&\n-\t\t hw->phy.link_info.phy_type != I40E_PHY_TYPE_10GBASE_T) {\n-\t\t\tnetdev_info(netdev, \"Autoneg cannot be disabled on this phy\\n\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n \t\t/* If autoneg is currently enabled */\n \t\tif (hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED) {\n+\t\t\t/* If autoneg is supported 10GBASE_T is the only phy\n+\t\t\t * that can disable it, so otherwise return error\n+\t\t\t */\n+\t\t\tif (safe_ecmd.supported & SUPPORTED_Autoneg &&\n+\t\t\t hw->phy.link_info.phy_type !=\n+\t\t\t I40E_PHY_TYPE_10GBASE_T) {\n+\t\t\t\tnetdev_info(netdev, \"Autoneg cannot be disabled on this phy\\n\");\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\t\t\t/* Autoneg is allowed to change */\n \t\t\tconfig.abilities = abilities.abilities &\n \t\t\t\t\t ~I40E_AQ_PHY_ENABLE_AN;\n \t\t\tchange = true;\n", "prefixes": [ "next", "S17", "09/11" ] }