{"id":792259,"url":"http://patchwork.ozlabs.org/api/1.2/patches/792259/?format=json","web_url":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170721183627.13373-1-bpoirier@suse.com/","project":{"id":46,"url":"http://patchwork.ozlabs.org/api/1.2/projects/46/?format=json","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":"<20170721183627.13373-1-bpoirier@suse.com>","list_archive_url":null,"date":"2017-07-21T18:36:23","name":"[1/5] e1000e: Fix error path in link detection","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2705e5881a02e104d1795b56d191c7c848254839","submitter":{"id":67008,"url":"http://patchwork.ozlabs.org/api/1.2/people/67008/?format=json","name":"Benjamin Poirier","email":"bpoirier@suse.com"},"delegate":{"id":68,"url":"http://patchwork.ozlabs.org/api/1.2/users/68/?format=json","username":"jtkirshe","first_name":"Jeff","last_name":"Kirsher","email":"jeffrey.t.kirsher@intel.com"},"mbox":"http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170721183627.13373-1-bpoirier@suse.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/792259/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/792259/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=)","Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3xDfcw4HMPz9s71\n\tfor ;\n\tSat, 22 Jul 2017 04:37:04 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A8A4A87F63;\n\tFri, 21 Jul 2017 18:37:02 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id hnm22rZ1MoX3; Fri, 21 Jul 2017 18:37:02 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2E4EB87B2B;\n\tFri, 21 Jul 2017 18:37:02 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D290B1C0964\n\tfor ;\n\tFri, 21 Jul 2017 18:36:58 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D01BB88A81\n\tfor ;\n\tFri, 21 Jul 2017 18:36:52 +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 uVqqzxn-PliK for ;\n\tFri, 21 Jul 2017 18:36:52 +0000 (UTC)","from mx1.suse.de (mx2.suse.de [195.135.220.15])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 0880A88B3F\n\tfor ;\n\tFri, 21 Jul 2017 18:36:52 +0000 (UTC)","from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx1.suse.de (Postfix) with ESMTP id 414CFABC3;\n\tFri, 21 Jul 2017 18:36:49 +0000 (UTC)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org","by amavisd-new at test-mx.suse.de"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Benjamin Poirier ","To":"Jeff Kirsher ","Date":"Fri, 21 Jul 2017 11:36:23 -0700","Message-Id":"<20170721183627.13373-1-bpoirier@suse.com>","X-Mailer":"git-send-email 2.13.2","In-Reply-To":"<20170721160937.GA22632@csclub.uwaterloo.ca>","References":"<20170721160937.GA22632@csclub.uwaterloo.ca>","Cc":"netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n\tlinux-kernel@vger.kernel.org,\n\tLennart Sorensen ","Subject":"[Intel-wired-lan] [PATCH 1/5] e1000e: Fix error path in link\n\tdetection","X-BeenThere":"intel-wired-lan@osuosl.org","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Intel Wired Ethernet Linux Kernel Driver Development\n\t","List-Unsubscribe":", \n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":", \n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"intel-wired-lan-bounces@osuosl.org","Sender":"\"Intel-wired-lan\" "},"content":"In case of error from e1e_rphy(), the loop will exit early and \"success\"\nwill be set to true erroneously.\n\nSigned-off-by: Benjamin Poirier \n---\n drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c\nindex d78d47b41a71..86ff0969efb6 100644\n--- a/drivers/net/ethernet/intel/e1000e/phy.c\n+++ b/drivers/net/ethernet/intel/e1000e/phy.c\n@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,\n \ts32 ret_val = 0;\n \tu16 i, phy_status;\n \n+\t*success = false;\n \tfor (i = 0; i < iterations; i++) {\n \t\t/* Some PHYs require the MII_BMSR register to be read\n \t\t * twice due to the link bit being sticky. No harm doing\n@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,\n \t\tret_val = e1e_rphy(hw, MII_BMSR, &phy_status);\n \t\tif (ret_val)\n \t\t\tbreak;\n-\t\tif (phy_status & BMSR_LSTATUS)\n+\t\tif (phy_status & BMSR_LSTATUS) {\n+\t\t\t*success = true;\n \t\t\tbreak;\n+\t\t}\n \t\tif (usec_interval >= 1000)\n \t\t\tmsleep(usec_interval / 1000);\n \t\telse\n \t\t\tudelay(usec_interval);\n \t}\n \n-\t*success = (i < iterations);\n-\n \treturn ret_val;\n }\n \n","prefixes":["1/5"]}