Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1257849/?format=api
{ "id": 1257849, "url": "http://patchwork.ozlabs.org/api/patches/1257849/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200318230102.36952-12-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": "<20200318230102.36952-12-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-03-18T23:01:01", "name": "[11/12] igc: Refactor igc_del_mac_filter()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d0cfbfa1fe15d075d73633652cc3f58799fe8fe2", "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/20200318230102.36952-12-andre.guedes@intel.com/mbox/", "series": [ { "id": 165243, "url": "http://patchwork.ozlabs.org/api/series/165243/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=165243", "date": "2020-03-18T23:00:52", "name": "igc: Refactor MAC address filtering code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/165243/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1257849/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1257849/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48jQXs4VyTz9sPk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 Mar 2020 10:02:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 30BFD87D3B;\n\tWed, 18 Mar 2020 23:02:20 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id dXGV2o3n26ly; Wed, 18 Mar 2020 23:02:19 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id F27D287CD4;\n\tWed, 18 Mar 2020 23:02:18 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9DE571BF335\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 94B6620435\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:14 +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 qfxM3bvpA6lh for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:12 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id F061E2041B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:11 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t18 Mar 2020 16:02:11 -0700", "from ymtomada-mobl.amr.corp.intel.com ([10.251.21.179])\n\tby orsmga006.jf.intel.com with ESMTP; 18 Mar 2020 16:02:10 -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": [ "S2GVMn0rH4i0a8+Q+aR1KljaxDakaw2kUgqOIPxQgUG6zZ0k8eNd1pztfxNDhGbnO5hple5PeO\n\t2U0n+g8nJoXA==", "a+7bhyjXTipYDqs5xTE2ZsGq6Ev1Hpik2RU01AJ6VSlUV4ayX/MYASPsk69MR4FHEZ62/VPkEl\n\trGMhD7go35SA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,569,1574150400\"; d=\"scan'208\";a=\"248341791\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 18 Mar 2020 16:01:01 -0700", "Message-Id": "<20200318230102.36952-12-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.25.0", "In-Reply-To": "<20200318230102.36952-1-andre.guedes@intel.com>", "References": "<20200318230102.36952-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 11/12] igc: Refactor igc_del_mac_filter()", "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\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<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": "This patch does a code refactoring in igc_del_mac_filter() so it uses\nthe new helper igc_find_mac_filter() and improves the comment about the\nspecial handling when deleting the default filter.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_main.c | 45 ++++++++++-------------\n 1 file changed, 19 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 0264e424bd07..fa7cf33c58a9 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -2268,40 +2268,33 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \t\t const u8 flags)\n {\n-\tstruct igc_hw *hw = &adapter->hw;\n-\tint rar_entries = hw->mac.rar_entry_count;\n-\tint i;\n+\tstruct igc_mac_addr *entry;\n+\tint index;\n \n \tif (!is_valid_ether_addr(addr))\n \t\treturn -EINVAL;\n \n-\tfor (i = 0; i < rar_entries; i++) {\n-\t\tif (!(adapter->mac_table[i].state & IGC_MAC_STATE_IN_USE))\n-\t\t\tcontinue;\n-\t\tif (flags && (adapter->mac_table[i].state & flags) != flags)\n-\t\t\tcontinue;\n-\t\tif (!ether_addr_equal(adapter->mac_table[i].addr, addr))\n-\t\t\tcontinue;\n+\tindex = igc_find_mac_filter(adapter, addr, flags);\n+\tif (index < 0)\n+\t\treturn -ENOENT;\n \n-\t\t/* When a filter for the default address is \"deleted\",\n-\t\t * we return it to its initial configuration\n-\t\t */\n-\t\tif (adapter->mac_table[i].state & IGC_MAC_STATE_DEFAULT) {\n-\t\t\tadapter->mac_table[i].state =\n-\t\t\t\tIGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;\n-\t\t\tadapter->mac_table[i].queue = -1;\n-\t\t\tigc_set_mac_filter_hw(adapter, 0, addr, -1);\n-\t\t} else {\n-\t\t\tadapter->mac_table[i].state = 0;\n-\t\t\tadapter->mac_table[i].queue = -1;\n-\t\t\tmemset(adapter->mac_table[i].addr, 0, ETH_ALEN);\n-\t\t\tigc_clear_mac_filter_hw(adapter, i);\n-\t\t}\n+\tentry = &adapter->mac_table[index];\n \n-\t\treturn 0;\n+\tif (entry->state & IGC_MAC_STATE_DEFAULT) {\n+\t\t/* If this is the default filter, we don't actually delete it.\n+\t\t * We just reset to its default value i.e. disable queue\n+\t\t * assignment.\n+\t\t */\n+\t\tentry->queue = -1;\n+\t\tigc_set_mac_filter_hw(adapter, 0, addr, entry->queue);\n+\t} else {\n+\t\tentry->state = 0;\n+\t\tentry->queue = -1;\n+\t\tmemset(entry->addr, 0, ETH_ALEN);\n+\t\tigc_clear_mac_filter_hw(adapter, index);\n \t}\n \n-\treturn -ENOENT;\n+\treturn 0;\n }\n \n static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)\n", "prefixes": [ "11/12" ] }