Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/693946/?format=api
{ "id": 693946, "url": "http://patchwork.ozlabs.org/api/patches/693946/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478896779-13697-15-git-send-email-bimmy.pujari@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": "<1478896779-13697-15-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-11T20:39:38", "name": "[next,S54,14/15] i40e: Deprecating unused macro and", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f249cf8e519eb1eee48f3ca9aac5171e6a8ada66", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1478896779-13697-15-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/693946/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/693946/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3tFsJl3Jr9z9t2g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 12 Nov 2016 07:41:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DD030867EC;\n\tFri, 11 Nov 2016 20:41:25 +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 UizJPXqmP-xB; Fri, 11 Nov 2016 20:41:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DB9A39567B;\n\tFri, 11 Nov 2016 20:41:19 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id B5F8F1CEC94\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:16 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B1A2BC2242\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:16 +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 zjFFQ7W9I-wW for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 74764C29B3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 11 Nov 2016 20:41:14 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP; 11 Nov 2016 12:41:14 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga005.fm.intel.com with ESMTP; 11 Nov 2016 12:41:14 -0800" ], "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.31,474,1473145200\"; d=\"scan'208\";a=\"30297969\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 11 Nov 2016 12:39:38 -0800", "Message-Id": "<1478896779-13697-15-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478896779-13697-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S54 14/15] i40e: Deprecating unused\n\tmacro and", "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": "I40E_MAC_X710 was supposed to be for 10G and I40E_MAC_XL710\nwas supposed to be for 40G. But function i40e_is_mac_710\nsets I40E_MAC_XL710 for all device IDS, I40E_MAC_X710 is not\nused at all. As there is nothing to compare there is no need\nfor this function. Thus deprecating this extra macro and\nremoving this function entirely and replacing it with a direct\ncheck.\n\nSigned-off-by: Bimmy Pujari <bimmy.pujari@intel.com>\nChange-ID: I7d1769954dccd574a290ac04adb836ebd156730e\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 13 -------------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 6 +++---\n drivers/net/ethernet/intel/i40e/i40e_type.h | 1 -\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 -\n 4 files changed, 3 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex e5dcdd3..e24a4ea 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -134,19 +134,6 @@\n /* default to trying for four seconds */\n #define I40E_TRY_LINK_TIMEOUT\t(4 * HZ)\n \n-/**\n- * i40e_is_mac_710 - Return true if MAC is X710/XL710\n- * @hw: ptr to the hardware info\n- **/\n-static inline bool i40e_is_mac_710(struct i40e_hw *hw)\n-{\n-\tif ((hw->mac.type == I40E_MAC_X710) ||\n-\t (hw->mac.type == I40E_MAC_XL710))\n-\t\treturn true;\n-\n-\treturn false;\n-}\n-\n /* driver state flags */\n enum i40e_state_t {\n \t__I40E_TESTING,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 59bc1f6..cdcc229 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -8687,7 +8687,7 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t\t\t pf->hw.func_caps.fd_filters_best_effort;\n \t}\n \n-\tif (i40e_is_mac_710(&pf->hw) &&\n+\tif ((pf->hw.mac.type == I40E_MAC_XL710) &&\n \t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||\n \t (pf->hw.aq.fw_maj_ver < 4))) {\n \t\tpf->flags |= I40E_FLAG_RESTART_AUTONEG;\n@@ -8696,13 +8696,13 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t}\n \n \t/* Disable FW LLDP if FW < v4.3 */\n-\tif (i40e_is_mac_710(&pf->hw) &&\n+\tif ((pf->hw.mac.type == I40E_MAC_XL710) &&\n \t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) ||\n \t (pf->hw.aq.fw_maj_ver < 4)))\n \t\tpf->flags |= I40E_FLAG_STOP_FW_LLDP;\n \n \t/* Use the FW Set LLDP MIB API if FW > v4.40 */\n-\tif (i40e_is_mac_710(&pf->hw) &&\n+\tif ((pf->hw.mac.type == I40E_MAC_XL710) &&\n \t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver >= 40)) ||\n \t (pf->hw.aq.fw_maj_ver >= 5)))\n \t\tpf->flags |= I40E_FLAG_USE_SET_LLDP_MIB;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 71795b1..b54232b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -125,7 +125,6 @@ enum i40e_debug_mask {\n */\n enum i40e_mac_type {\n \tI40E_MAC_UNKNOWN = 0,\n-\tI40E_MAC_X710,\n \tI40E_MAC_XL710,\n \tI40E_MAC_VF,\n \tI40E_MAC_X722,\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 493c803..9187c43 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -100,7 +100,6 @@ enum i40e_debug_mask {\n */\n enum i40e_mac_type {\n \tI40E_MAC_UNKNOWN = 0,\n-\tI40E_MAC_X710,\n \tI40E_MAC_XL710,\n \tI40E_MAC_VF,\n \tI40E_MAC_X722,\n", "prefixes": [ "next", "S54", "14/15" ] }