Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/457861/?format=api
{ "id": 457861, "url": "http://patchwork.ozlabs.org/api/patches/457861/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20150403085138.6124.95003.stgit@gmw-smvitp108.amr.corp.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": "<20150403085138.6124.95003.stgit@gmw-smvitp108.amr.corp.intel.com>", "list_archive_url": null, "date": "2015-04-03T08:52:29", "name": "[net-next,v2] igb: simplify and clean up igb_enable_mas()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "69466d3870ed38549bd0e2cb077a6a6bea7b8cfb", "submitter": { "id": 29211, "url": "http://patchwork.ozlabs.org/api/people/29211/?format=api", "name": "Fujinaka, Todd", "email": "todd.fujinaka@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/20150403085138.6124.95003.stgit@gmw-smvitp108.amr.corp.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/457861/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/457861/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 silver.osuosl.org (silver.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id CC47D1401E7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 3 Apr 2015 19:52:35 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B818132EEB;\n\tFri, 3 Apr 2015 08:52:34 +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 fvI17fGuGpBO; Fri, 3 Apr 2015 08:52:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3CAE730D9C;\n\tFri, 3 Apr 2015 08:52:33 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 992E51C28C8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 08:52:31 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 92D1CA3CA9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 08:52:31 +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 W-_P-6ptendF for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 08:52:31 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 088ACA3CC5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 08:52:30 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga103.fm.intel.com with ESMTP; 03 Apr 2015 01:52:30 -0700", "from lwang4-mobl1.amr.corp.intel.com (HELO\n\tgmw-smvitp108.amr.corp.intel.com) ([10.254.109.203])\n\tby orsmga001.jf.intel.com with ESMTP; 03 Apr 2015 01:52:30 -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.11,516,1422950400\"; d=\"scan'208\";a=\"674760862\"", "From": "Todd Fujinaka <todd.fujinaka@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 03 Apr 2015 01:52:29 -0700", "Message-ID": "<20150403085138.6124.95003.stgit@gmw-smvitp108.amr.corp.intel.com>", "User-Agent": "StGit/0.17-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-next v2] igb: simplify and clean up\n\tigb_enable_mas()", "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>", "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": "igb_enable_mas() should only be called for the 82575 and has no clear\nreturn so changing it to void. Also simplify the odd conditional\nexpression.\n\nSigned-off-by: Todd Fujinaka <todd.fujinaka@intel.com>\nReported-by: Dan Carpenter <dan.carpenter@oracle.com>\n---\nv2: made igb_enable_mas() static based on feedback from automated testing\n---\n drivers/net/ethernet/intel/igb/igb_main.c | 27 +++++++--------------------\n 1 file changed, 7 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c\nindex 8457d03..e636646 100644\n--- a/drivers/net/ethernet/intel/igb/igb_main.c\n+++ b/drivers/net/ethernet/intel/igb/igb_main.c\n@@ -1834,31 +1834,19 @@ void igb_reinit_locked(struct igb_adapter *adapter)\n *\n * @adapter: adapter struct\n **/\n-static s32 igb_enable_mas(struct igb_adapter *adapter)\n+static void igb_enable_mas(struct igb_adapter *adapter)\n {\n \tstruct e1000_hw *hw = &adapter->hw;\n-\tu32 connsw;\n-\ts32 ret_val = 0;\n-\n-\tconnsw = rd32(E1000_CONNSW);\n-\tif (!(hw->phy.media_type == e1000_media_type_copper))\n-\t\treturn ret_val;\n+\tu32 connsw = rd32(E1000_CONNSW);\n \n \t/* configure for SerDes media detect */\n-\tif (!(connsw & E1000_CONNSW_SERDESD)) {\n+\tif ((hw->phy.media_type == e1000_media_type_copper) &&\n+\t (!(connsw & E1000_CONNSW_SERDESD))) {\n \t\tconnsw |= E1000_CONNSW_ENRGSRC;\n \t\tconnsw |= E1000_CONNSW_AUTOSENSE_EN;\n \t\twr32(E1000_CONNSW, connsw);\n \t\twrfl();\n-\t} else if (connsw & E1000_CONNSW_SERDESD) {\n-\t\t/* already SerDes, no need to enable anything */\n-\t\treturn ret_val;\n-\t} else {\n-\t\tnetdev_info(adapter->netdev,\n-\t\t\t\"MAS: Unable to configure feature, disabling..\\n\");\n-\t\tadapter->flags &= ~IGB_FLAG_MAS_ENABLE;\n \t}\n-\treturn ret_val;\n }\n \n void igb_reset(struct igb_adapter *adapter)\n@@ -1978,10 +1966,9 @@ void igb_reset(struct igb_adapter *adapter)\n \t\tadapter->ei.get_invariants(hw);\n \t\tadapter->flags &= ~IGB_FLAG_MEDIA_RESET;\n \t}\n-\tif (adapter->flags & IGB_FLAG_MAS_ENABLE) {\n-\t\tif (igb_enable_mas(adapter))\n-\t\t\tdev_err(&pdev->dev,\n-\t\t\t\t\"Error enabling Media Auto Sense\\n\");\n+\tif ((mac->type == e1000_82575) &&\n+\t (adapter->flags & IGB_FLAG_MAS_ENABLE)) {\n+\t\tigb_enable_mas(adapter);\n \t}\n \tif (hw->mac.ops.init_hw(hw))\n \t\tdev_err(&pdev->dev, \"Hardware Error\\n\");\n", "prefixes": [ "net-next", "v2" ] }