Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1269220/?format=api
{ "id": 1269220, "url": "http://patchwork.ozlabs.org/api/patches/1269220/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200411002834.13916-2-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": "<20200411002834.13916-2-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-11T00:28:31", "name": "[1/4] igc: Remove IGC_MAC_STATE_SRC_ADDR flag", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2ae63fe3fa18ae1af1e3146e894d0108a9759372", "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/20200411002834.13916-2-andre.guedes@intel.com/mbox/", "series": [ { "id": 169691, "url": "http://patchwork.ozlabs.org/api/series/169691/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=169691", "date": "2020-04-11T00:28:30", "name": "igc: Enable NFC rules based on source MAC address", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/169691/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1269220/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1269220/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.137;\n\thelo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 48zbN26B3pz9sSt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 11 Apr 2020 10:28:50 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3731080D43;\n\tSat, 11 Apr 2020 00:28:48 +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 qvnjv9AfGbrs; Sat, 11 Apr 2020 00:28:47 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2017E86B43;\n\tSat, 11 Apr 2020 00:28:47 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5F5881BF2C1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5C45385DD8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:43 +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 GAHi0ITzghrB for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:40 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id A861485DCF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 11 Apr 2020 00:28:40 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t10 Apr 2020 17:28:40 -0700", "from nwu5-mobl1.amr.corp.intel.com ([10.134.124.160])\n\tby fmsmga001.fm.intel.com with ESMTP; 10 Apr 2020 17:28:39 -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": [ "Ojf0WkorUXnpchBHiisY/H0PJPEOiuFJleKAy9i723cnbLjPGGWWUoqFGvi0JMpeDb+RLaUT59\n\t6Ez9TvIRffWg==", "HpQVEWu4NIPgYMttfmgJLE+N80TaYKR5RWNX3PMqfUe9E2OaDYTYa/WEIZ4Emnh4DxhaBpRUYM\n\tqB26VlJQcu2A==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.72,368,1580803200\"; d=\"scan'208\";a=\"362585532\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 10 Apr 2020 17:28:31 -0700", "Message-Id": "<20200411002834.13916-2-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200411002834.13916-1-andre.guedes@intel.com>", "References": "<20200411002834.13916-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 1/4] igc: Remove IGC_MAC_STATE_SRC_ADDR\n\tflag", "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": "MAC address filters based on source address are not currently supported\nby the IGC driver. Despite of that, the driver have some dangling code\nto handle it, inherited from IGB driver. This patch removes that code to\nprepare for a follow up patch that adds proper source MAC address filter\nsupport.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 6 ++---\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 16 ++----------\n drivers/net/ethernet/intel/igc/igc_main.c | 27 ++++++--------------\n 3 files changed, 12 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex 22dde0590a23..c4c4498ab48f 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -231,9 +231,8 @@ bool igc_has_link(struct igc_adapter *adapter);\n void igc_reset(struct igc_adapter *adapter);\n int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx);\n int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t const s8 queue, const u8 flags);\n-int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t const u8 flags);\n+\t\t const s8 queue);\n+int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr);\n int igc_add_vlan_prio_filter(struct igc_adapter *adapter, int prio,\n \t\t\t int queue);\n void igc_del_vlan_prio_filter(struct igc_adapter *adapter, int prio);\n@@ -479,7 +478,6 @@ struct igc_mac_addr {\n \n #define IGC_MAC_STATE_DEFAULT\t\t0x1\n #define IGC_MAC_STATE_IN_USE\t\t0x2\n-#define IGC_MAC_STATE_SRC_ADDR\t\t0x4\n \n #define IGC_MAX_RXNFC_FILTERS\t\t16\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 285310a99ddc..36e94142b248 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -1208,15 +1208,7 @@ int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\n \n \tif (input->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR) {\n \t\terr = igc_add_mac_filter(adapter, input->filter.dst_addr,\n-\t\t\t\t\t input->action, 0);\n-\t\tif (err)\n-\t\t\treturn err;\n-\t}\n-\n-\tif (input->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR) {\n-\t\terr = igc_add_mac_filter(adapter, input->filter.src_addr,\n-\t\t\t\t\t input->action,\n-\t\t\t\t\t IGC_MAC_STATE_SRC_ADDR);\n+\t\t\t\t\t input->action);\n \t\tif (err)\n \t\t\treturn err;\n \t}\n@@ -1246,12 +1238,8 @@ int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\n \t\tigc_del_vlan_prio_filter(adapter, prio);\n \t}\n \n-\tif (input->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR)\n-\t\tigc_del_mac_filter(adapter, input->filter.src_addr,\n-\t\t\t\t IGC_MAC_STATE_SRC_ADDR);\n-\n \tif (input->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR)\n-\t\tigc_del_mac_filter(adapter, input->filter.dst_addr, 0);\n+\t\tigc_del_mac_filter(adapter, input->filter.dst_addr);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c\nindex 9c2d487803b2..411af7eafe19 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -2185,8 +2185,7 @@ static void igc_nfc_filter_restore(struct igc_adapter *adapter)\n \tspin_unlock(&adapter->nfc_lock);\n }\n \n-static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t\t u8 flags)\n+static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n {\n \tint max_entries = adapter->hw.mac.rar_entry_count;\n \tstruct igc_mac_addr *entry;\n@@ -2199,9 +2198,6 @@ static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \t\t\tcontinue;\n \t\tif (!ether_addr_equal(addr, entry->addr))\n \t\t\tcontinue;\n-\t\tif ((entry->state & IGC_MAC_STATE_SRC_ADDR) !=\n-\t\t (flags & IGC_MAC_STATE_SRC_ADDR))\n-\t\t\tcontinue;\n \n \t\treturn i;\n \t}\n@@ -2232,23 +2228,19 @@ static int igc_get_avail_mac_filter_slot(struct igc_adapter *adapter)\n * @queue: If non-negative, queue assignment feature is enabled and frames\n * matching the filter are enqueued onto 'queue'. Otherwise, queue\n * assignment is disabled.\n- * @flags: Set IGC_MAC_STATE_SRC_ADDR bit to indicate @address is a source\n- * address.\n *\n * Return: 0 in case of success, negative errno code otherwise.\n */\n int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t const s8 queue, const u8 flags)\n+\t\t const s8 queue)\n {\n \tstruct net_device *dev = adapter->netdev;\n \tint index;\n \n \tif (!is_valid_ether_addr(addr))\n \t\treturn -EINVAL;\n-\tif (flags & IGC_MAC_STATE_SRC_ADDR)\n-\t\treturn -ENOTSUPP;\n \n-\tindex = igc_find_mac_filter(adapter, addr, flags);\n+\tindex = igc_find_mac_filter(adapter, addr);\n \tif (index >= 0)\n \t\tgoto update_queue_assignment;\n \n@@ -2260,7 +2252,7 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \t\t index, addr, queue);\n \n \tether_addr_copy(adapter->mac_table[index].addr, addr);\n-\tadapter->mac_table[index].state |= IGC_MAC_STATE_IN_USE | flags;\n+\tadapter->mac_table[index].state |= IGC_MAC_STATE_IN_USE;\n update_queue_assignment:\n \tadapter->mac_table[index].queue = queue;\n \n@@ -2272,13 +2264,10 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n * igc_del_mac_filter() - Delete MAC address filter.\n * @adapter: Pointer to adapter where the filter should be deleted from.\n * @addr: MAC address.\n- * @flags: Set IGC_MAC_STATE_SRC_ADDR bit to indicate @address is a source\n- * address.\n *\n * Return: 0 in case of success, negative errno code otherwise.\n */\n-int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t const u8 flags)\n+int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr)\n {\n \tstruct net_device *dev = adapter->netdev;\n \tstruct igc_mac_addr *entry;\n@@ -2287,7 +2276,7 @@ int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n \tif (!is_valid_ether_addr(addr))\n \t\treturn -EINVAL;\n \n-\tindex = igc_find_mac_filter(adapter, addr, flags);\n+\tindex = igc_find_mac_filter(adapter, addr);\n \tif (index < 0)\n \t\treturn -ENOENT;\n \n@@ -2464,14 +2453,14 @@ static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n-\treturn igc_add_mac_filter(adapter, addr, -1, 0);\n+\treturn igc_add_mac_filter(adapter, addr, -1);\n }\n \n static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr)\n {\n \tstruct igc_adapter *adapter = netdev_priv(netdev);\n \n-\treturn igc_del_mac_filter(adapter, addr, 0);\n+\treturn igc_del_mac_filter(adapter, addr);\n }\n \n /**\n", "prefixes": [ "1/4" ] }