Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/730827/?format=api
{ "id": 730827, "url": "http://patchwork.ozlabs.org/api/patches/730827/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1487721348-25617-11-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": "<1487721348-25617-11-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2017-02-21T23:55:48", "name": "[next,S61,10/10] i40e: Drop FCoE code that always evaluates to false or 0", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8d8c921f670f51d6930ef4e1e55cf20177a495bc", "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/1487721348-25617-11-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/730827/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/730827/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 3vSbWJ4Mdmz9s7D\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 22 Feb 2017 09:58:04 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AF4198ADFF;\n\tTue, 21 Feb 2017 22:58:02 +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 8y7-CCU4+lWi; Tue, 21 Feb 2017 22:58:01 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3032B8AE36;\n\tTue, 21 Feb 2017 22:58:01 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id EAAB51BFF60\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 21 Feb 2017 22:57:57 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E70C38A4D1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 21 Feb 2017 22:57:57 +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 Qao3aLIJKsy8 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 21 Feb 2017 22:57:57 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 0092F8A60F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 21 Feb 2017 22:57:56 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t21 Feb 2017 14:57:55 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([10.166.35.87])\n\tby fmsmga002.fm.intel.com with ESMTP; 21 Feb 2017 14:57:55 -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.35,191,1484035200\"; d=\"scan'208\";\n\ta=\"1133083152\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 21 Feb 2017 15:55:48 -0800", "Message-Id": "<1487721348-25617-11-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1487721348-25617-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1487721348-25617-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S61 10/10] i40e: Drop FCoE code that\n\talways evaluates to false or 0", "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": "From: Alexander Duyck <alexander.h.duyck@intel.com>\n\nSince FCoE isn't supported by the i40e products there isn't much point in\ncarrying around code that will always evaluate to false. This patch goes\nthrough and strips out the code in several spots so that we don't go around\ncarrying variables and/or code that is always going to evaluate to false or\n0.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\nChange-ID: I39d1d779c66c638b75525839db2b6208fdc809d7\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 3 ---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 17 +++--------------\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 -\n 3 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 504fd99..9d76645 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -405,9 +405,6 @@ struct i40e_pf {\n \t */\n \tu16 dcbx_cap;\n \n-\tu32 fcoe_hmc_filt_num;\n-\tu32 fcoe_hmc_cntx_num;\n-\n \tstruct i40e_filter_control_settings filter_settings;\n \n \tstruct ptp_clock *ptp_clock;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 909bdd6..384e0d3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -4496,14 +4496,6 @@ static void i40e_quiesce_vsi(struct i40e_vsi *vsi)\n \tif (test_bit(__I40E_DOWN, &vsi->state))\n \t\treturn;\n \n-\t/* No need to disable FCoE VSI when Tx suspended */\n-\tif ((test_bit(__I40E_PORT_TX_SUSPENDED, &vsi->back->state)) &&\n-\t vsi->type == I40E_VSI_FCOE) {\n-\t\tdev_dbg(&vsi->back->pdev->dev,\n-\t\t\t \"VSI seid %d skipping FCoE VSI disable\\n\", vsi->seid);\n-\t\treturn;\n-\t}\n-\n \tset_bit(__I40E_NEEDS_RESTART, &vsi->state);\n \tif (vsi->netdev && netif_running(vsi->netdev))\n \t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n@@ -4621,8 +4613,7 @@ static int i40e_pf_wait_queues_disabled(struct i40e_pf *pf)\n \tint v, ret = 0;\n \n \tfor (v = 0; v < pf->hw.func_caps.num_vsis; v++) {\n-\t\t/* No need to wait for FCoE VSI queues */\n-\t\tif (pf->vsi[v] && pf->vsi[v]->type != I40E_VSI_FCOE) {\n+\t\tif (pf->vsi[v]) {\n \t\t\tret = i40e_vsi_wait_queues_disabled(pf->vsi[v]);\n \t\t\tif (ret)\n \t\t\t\tbreak;\n@@ -7077,8 +7068,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)\n \t\tgoto end_core_reset;\n \n \tret = i40e_init_lan_hmc(hw, hw->func_caps.num_tx_qp,\n-\t\t\t\thw->func_caps.num_rx_qp,\n-\t\t\t\tpf->fcoe_hmc_cntx_num, pf->fcoe_hmc_filt_num);\n+\t\t\t\thw->func_caps.num_rx_qp, 0, 0);\n \tif (ret) {\n \t\tdev_info(&pf->pdev->dev, \"init_lan_hmc failed: %d\\n\", ret);\n \t\tgoto end_core_reset;\n@@ -11360,8 +11350,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t}\n \n \terr = i40e_init_lan_hmc(hw, hw->func_caps.num_tx_qp,\n-\t\t\t\thw->func_caps.num_rx_qp,\n-\t\t\t\tpf->fcoe_hmc_cntx_num, pf->fcoe_hmc_filt_num);\n+\t\t\t\thw->func_caps.num_rx_qp, 0, 0);\n \tif (err) {\n \t\tdev_info(&pdev->dev, \"init_lan_hmc failed: %d\\n\", err);\n \t\tgoto err_init_lan_hmc;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\nindex 52ba9d5..558ddf1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n@@ -109,7 +109,6 @@ struct i40e_vf {\n \tu16 stag;\n \n \tstruct i40e_virtchnl_ether_addr default_lan_addr;\n-\tstruct i40e_virtchnl_ether_addr default_fcoe_addr;\n \tu16 port_vlan_id;\n \tbool pf_set_mac;\t/* The VMM admin set the VF MAC address */\n \tbool trusted;\n", "prefixes": [ "next", "S61", "10/10" ] }