Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512048/?format=api
{ "id": 512048, "url": "http://patchwork.ozlabs.org/api/patches/512048/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-11-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": "<1440798961-17326-11-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:55:56", "name": "[next,S13,10/15] i40e: refactor code to remove indent", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ca1326bfea601c0bd2dbd44b58d304de8c9f20ba", "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/1440798961-17326-11-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512048/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512048/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 2D8191401C7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Aug 2015 07:55:15 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 833238B97B;\n\tFri, 28 Aug 2015 21:55:14 +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 QiEtYUONoN57; Fri, 28 Aug 2015 21:55:13 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 311958B984;\n\tFri, 28 Aug 2015 21:55:12 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2A69E1CEB0B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id ECBFF95ECC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:08 +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 zsr2+X6T9j3V for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 64EA395ED8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 28 Aug 2015 14:55:07 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 28 Aug 2015 14:55:07 -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,427,1437462000\"; d=\"scan'208\";a=\"634260307\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:55:56 -0400", "Message-Id": "<1440798961-17326-11-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S13 10/15] i40e: refactor code to\n\tremove indent", "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: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nI found a code indent that was avoidable because a whole function is inside\nan if block, reverse the if and move the code back a tab.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: I9989c8750ee61678fbf96a3b0fd7bf7cc7ef300a\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 82 +++++++++++++++--------------\n 1 file changed, 42 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 87ad491..2771259 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -5540,49 +5540,51 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf)\n \tif (!(pf->flags & (I40E_FLAG_FD_SB_ENABLED | I40E_FLAG_FD_ATR_ENABLED)))\n \t\treturn;\n \n-\tif (time_after(jiffies, pf->fd_flush_timestamp +\n-\t\t\t\t(I40E_MIN_FD_FLUSH_INTERVAL * HZ))) {\n-\t\t/* If the flush is happening too quick and we have mostly\n-\t\t * SB rules we should not re-enable ATR for some time.\n-\t\t */\n-\t\tmin_flush_time = pf->fd_flush_timestamp\n-\t\t\t\t+ (I40E_MIN_FD_FLUSH_SB_ATR_UNSTABLE * HZ);\n-\t\tfd_room = pf->fdir_pf_filter_count - pf->fdir_pf_active_filters;\n+\tif (!time_after(jiffies, pf->fd_flush_timestamp +\n+\t\t\t\t (I40E_MIN_FD_FLUSH_INTERVAL * HZ)))\n+\t\treturn;\n \n-\t\tif (!(time_after(jiffies, min_flush_time)) &&\n-\t\t (fd_room < I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR)) {\n-\t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n-\t\t\t\tdev_info(&pf->pdev->dev, \"ATR disabled, not enough FD filter space.\\n\");\n-\t\t\tdisable_atr = true;\n-\t\t}\n+\t/* If the flush is happening too quick and we have mostly SB rules we\n+\t * should not re-enable ATR for some time.\n+\t */\n+\tmin_flush_time = pf->fd_flush_timestamp +\n+\t\t\t (I40E_MIN_FD_FLUSH_SB_ATR_UNSTABLE * HZ);\n+\tfd_room = pf->fdir_pf_filter_count - pf->fdir_pf_active_filters;\n \n-\t\tpf->fd_flush_timestamp = jiffies;\n-\t\tpf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n-\t\t/* flush all filters */\n-\t\twr32(&pf->hw, I40E_PFQF_CTL_1,\n-\t\t I40E_PFQF_CTL_1_CLEARFDTABLE_MASK);\n-\t\ti40e_flush(&pf->hw);\n-\t\tpf->fd_flush_cnt++;\n-\t\tpf->fd_add_err = 0;\n-\t\tdo {\n-\t\t\t/* Check FD flush status every 5-6msec */\n-\t\t\tusleep_range(5000, 6000);\n-\t\t\treg = rd32(&pf->hw, I40E_PFQF_CTL_1);\n-\t\t\tif (!(reg & I40E_PFQF_CTL_1_CLEARFDTABLE_MASK))\n-\t\t\t\tbreak;\n-\t\t} while (flush_wait_retry--);\n-\t\tif (reg & I40E_PFQF_CTL_1_CLEARFDTABLE_MASK) {\n-\t\t\tdev_warn(&pf->pdev->dev, \"FD table did not flush, needs more time\\n\");\n-\t\t} else {\n-\t\t\t/* replay sideband filters */\n-\t\t\ti40e_fdir_filter_restore(pf->vsi[pf->lan_vsi]);\n-\t\t\tif (!disable_atr)\n-\t\t\t\tpf->flags |= I40E_FLAG_FD_ATR_ENABLED;\n-\t\t\tclear_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);\n-\t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n-\t\t\t\tdev_info(&pf->pdev->dev, \"FD Filter table flushed and FD-SB replayed.\\n\");\n-\t\t}\n+\tif (!(time_after(jiffies, min_flush_time)) &&\n+\t (fd_room < I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR)) {\n+\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n+\t\t\tdev_info(&pf->pdev->dev, \"ATR disabled, not enough FD filter space.\\n\");\n+\t\tdisable_atr = true;\n+\t}\n+\n+\tpf->fd_flush_timestamp = jiffies;\n+\tpf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n+\t/* flush all filters */\n+\twr32(&pf->hw, I40E_PFQF_CTL_1,\n+\t I40E_PFQF_CTL_1_CLEARFDTABLE_MASK);\n+\ti40e_flush(&pf->hw);\n+\tpf->fd_flush_cnt++;\n+\tpf->fd_add_err = 0;\n+\tdo {\n+\t\t/* Check FD flush status every 5-6msec */\n+\t\tusleep_range(5000, 6000);\n+\t\treg = rd32(&pf->hw, I40E_PFQF_CTL_1);\n+\t\tif (!(reg & I40E_PFQF_CTL_1_CLEARFDTABLE_MASK))\n+\t\t\tbreak;\n+\t} while (flush_wait_retry--);\n+\tif (reg & I40E_PFQF_CTL_1_CLEARFDTABLE_MASK) {\n+\t\tdev_warn(&pf->pdev->dev, \"FD table did not flush, needs more time\\n\");\n+\t} else {\n+\t\t/* replay sideband filters */\n+\t\ti40e_fdir_filter_restore(pf->vsi[pf->lan_vsi]);\n+\t\tif (!disable_atr)\n+\t\t\tpf->flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\t\tclear_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);\n+\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n+\t\t\tdev_info(&pf->pdev->dev, \"FD Filter table flushed and FD-SB replayed.\\n\");\n \t}\n+\n }\n \n /**\n", "prefixes": [ "next", "S13", "10/15" ] }