Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1276670/?format=api
{ "id": 1276670, "url": "http://patchwork.ozlabs.org/api/patches/1276670/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200424201623.10971-10-andre.guedes@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": "<20200424201623.10971-10-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-24T20:16:13", "name": "[09/19] igc: Fix 'sw_idx' type in struct igc_nfc_rule", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f491973fa584a8a20f4d1eea3dc36044dcb57815", "submitter": { "id": 72323, "url": "http://patchwork.ozlabs.org/api/people/72323/?format=api", "name": "Andre Guedes", "email": "andre.guedes@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/20200424201623.10971-10-andre.guedes@intel.com/mbox/", "series": [ { "id": 172579, "url": "http://patchwork.ozlabs.org/api/series/172579/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=172579", "date": "2020-04-24T20:16:07", "name": "igc: Fixes to NFC support code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/172579/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1276670/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1276670/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49857m6VvWz9sSG\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 25 Apr 2020 06:17:40 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 77D232156E;\n\tFri, 24 Apr 2020 20:17:39 +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 ndOKckyCQduK; Fri, 24 Apr 2020 20:17:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id BCFC520526;\n\tFri, 24 Apr 2020 20:17:33 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id 26E2C1BF83C\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id 22D78868BC\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:29 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id WKTuAxrnf1QK for <intel-wired-lan@lists.osuosl.org>;\n Fri, 24 Apr 2020 20:17:27 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 277F4868A9\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:27 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Apr 2020 13:17:26 -0700", "from kleandre-mobl.amr.corp.intel.com ([10.213.164.39])\n by orsmga001.jf.intel.com with ESMTP; 24 Apr 2020 13:17:26 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n TFVNB2O/CXHwP+2elRb6Mya5q0WgAEm5fEjIZlNheHObSv+Z1gAa0rrcMubzsePB8vr3k8o4HT\n vjvUV/hRc7nw==", "\n UCr2dySd9tBn1DDNlrvO1navv2qN8uRszplTLAh1KM6YcuYBG09ZxprcY2iLOoL1HNhEvk/Yp7\n hsEYvdI4J8OQ==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,313,1583222400\"; d=\"scan'208\";a=\"335474511\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 24 Apr 2020 13:16:13 -0700", "Message-Id": "<20200424201623.10971-10-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200424201623.10971-1-andre.guedes@intel.com>", "References": "<20200424201623.10971-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 09/19] igc: Fix 'sw_idx' type in struct\n igc_nfc_rule", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "The 'sw_idx' field from 'struct igc_nfc_rule' is u16 type but it is\nassigned an u32 value in igc_ethtool_init_nfc_rule(). This patch changes\n'sw_idx' type to u32 so they match. Also, it makes more sense to call\nthis field 'location' since it holds the NFC rule location.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 2 +-\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 16 ++++++++--------\n 2 files changed, 9 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex fcc6261d7f67..ae7d48070ee2 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -463,7 +463,7 @@ struct igc_nfc_filter {\n struct igc_nfc_rule {\n \tstruct hlist_node nfc_node;\n \tstruct igc_nfc_filter filter;\n-\tu16 sw_idx;\n+\tu32 location;\n \tu16 action;\n };\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex bdb7c99f66be..93274e75e8c5 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -940,11 +940,11 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,\n \tcmd->data = IGC_MAX_RXNFC_RULES;\n \n \thlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {\n-\t\tif (fsp->location <= rule->sw_idx)\n+\t\tif (fsp->location <= rule->location)\n \t\t\tbreak;\n \t}\n \n-\tif (!rule || fsp->location != rule->sw_idx)\n+\tif (!rule || fsp->location != rule->location)\n \t\treturn -EINVAL;\n \n \tif (!rule->filter.match_flags)\n@@ -991,7 +991,7 @@ static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter,\n \thlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {\n \t\tif (cnt == cmd->rule_cnt)\n \t\t\treturn -EMSGSIZE;\n-\t\trule_locs[cnt] = rule->sw_idx;\n+\t\trule_locs[cnt] = rule->location;\n \t\tcnt++;\n \t}\n \n@@ -1240,7 +1240,7 @@ int igc_disable_nfc_rule(struct igc_adapter *adapter,\n \n static int igc_ethtool_update_nfc_rule(struct igc_adapter *adapter,\n \t\t\t\t struct igc_nfc_rule *input,\n-\t\t\t\t u16 sw_idx)\n+\t\t\t\t u32 location)\n {\n \tstruct igc_nfc_rule *rule, *parent;\n \tint err = -EINVAL;\n@@ -1250,13 +1250,13 @@ static int igc_ethtool_update_nfc_rule(struct igc_adapter *adapter,\n \n \thlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {\n \t\t/* hash found, or no matching entry */\n-\t\tif (rule->sw_idx >= sw_idx)\n+\t\tif (rule->location >= location)\n \t\t\tbreak;\n \t\tparent = rule;\n \t}\n \n \t/* if there is an old rule occupying our place remove it */\n-\tif (rule && rule->sw_idx == sw_idx) {\n+\tif (rule && rule->location == location) {\n \t\tif (!input)\n \t\t\terr = igc_disable_nfc_rule(adapter, rule);\n \n@@ -1289,7 +1289,7 @@ static void igc_ethtool_init_nfc_rule(struct igc_nfc_rule *rule,\n \tINIT_HLIST_NODE(&rule->nfc_node);\n \n \trule->action = fsp->ring_cookie;\n-\trule->sw_idx = fsp->location;\n+\trule->location = fsp->location;\n \n \tif ((fsp->flow_type & FLOW_EXT) && fsp->m_ext.vlan_tci) {\n \t\trule->filter.vlan_tci = ntohs(fsp->h_ext.vlan_tci);\n@@ -1412,7 +1412,7 @@ static int igc_ethtool_add_nfc_rule(struct igc_adapter *adapter,\n \tif (err)\n \t\tgoto err;\n \n-\tigc_ethtool_update_nfc_rule(adapter, rule, rule->sw_idx);\n+\tigc_ethtool_update_nfc_rule(adapter, rule, rule->location);\n \n \tspin_unlock(&adapter->nfc_rule_lock);\n \treturn 0;\n", "prefixes": [ "09/19" ] }