Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1257854/?format=api
{ "id": 1257854, "url": "http://patchwork.ozlabs.org/api/patches/1257854/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200318230102.36952-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": "<20200318230102.36952-10-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-03-18T23:00:59", "name": "[09/12] igc: Remove igc_*_mac_steering_filter() wrappers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "84fd82bdea5e7d04a045e1edc7901100d3b0f487", "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-10-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/1257854/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1257854/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 48jQXy1BJzz9sPk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 19 Mar 2020 10:02:26 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5842D87CDA;\n\tWed, 18 Mar 2020 23:02:24 +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 BZLdB3gIBV9h; Wed, 18 Mar 2020 23:02:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 4C78E87D2C;\n\tWed, 18 Mar 2020 23:02:19 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id CE5061BF335\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C4B59203F3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:15 +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 WvRuM2a0YyCo for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 18 Mar 2020 23:02:11 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 6879120403\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:10 -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": [ "I/17xcu9a/esMIXMktN3zIeuIlzHVngHh1eq5P/yfByh7BruJFB9Ch5jNG/IpeJ0hFaZHQA68r\n\tdWGFBrkyJiuA==", "KS5yX2NQ9Or9/l9iSOFK2rfKth4ScxRHS+Ax3oPQdS1DGizH9e3zyaW4lcDa1kiDz8tplWeLc3\n\tNbIekxNfzxZw==" ], "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=\"248341788\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 18 Mar 2020 16:00:59 -0700", "Message-Id": "<20200318230102.36952-10-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 09/12] igc: Remove\n\tigc_*_mac_steering_filter() wrappers", "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": "With the previous two patches, igc_add_mac_steering_filter() and\nigc_del_mac_steering_filter() became a pointless wrapper of\nigc_add_mac_filter() and igc_del_mac_filter().\n\nThis patch removes these wrappers and update callers to call\nigc_add_mac_filter() and igc_del_mac_filter() directly.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc.h | 8 ++++----\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 20 ++++++++------------\n drivers/net/ethernet/intel/igc/igc_main.c | 20 ++++----------------\n 3 files changed, 16 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h\nindex 192cef07bdf7..6c18c74a68fb 100644\n--- a/drivers/net/ethernet/intel/igc/igc.h\n+++ b/drivers/net/ethernet/intel/igc/igc.h\n@@ -231,10 +231,10 @@ void igc_write_rss_indir_tbl(struct igc_adapter *adapter);\n 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_steering_filter(struct igc_adapter *adapter,\n-\t\t\t\tconst u8 *addr, u8 queue, u8 flags);\n-int igc_del_mac_steering_filter(struct igc_adapter *adapter,\n-\t\t\t\tconst u8 *addr, u8 queue, u8 flags);\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 void igc_update_stats(struct igc_adapter *adapter);\n \n /* igc_dump declarations */\ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 9ef133fe6e40..93608bd57c29 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -1267,18 +1267,16 @@ int igc_add_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\n \t}\n \n \tif (input->filter.match_flags & IGC_FILTER_FLAG_DST_MAC_ADDR) {\n-\t\terr = igc_add_mac_steering_filter(adapter,\n-\t\t\t\t\t\t input->filter.dst_addr,\n-\t\t\t\t\t\t input->action, 0);\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_steering_filter(adapter,\n-\t\t\t\t\t\t input->filter.src_addr,\n-\t\t\t\t\t\t input->action,\n-\t\t\t\t\t\t IGC_MAC_STATE_SRC_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\tif (err)\n \t\t\treturn err;\n \t}\n@@ -1332,13 +1330,11 @@ int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\n \t\t\t\t\t ntohs(input->filter.vlan_tci));\n \n \tif (input->filter.match_flags & IGC_FILTER_FLAG_SRC_MAC_ADDR)\n-\t\tigc_del_mac_steering_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\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_steering_filter(adapter, input->filter.dst_addr,\n-\t\t\t\t\t input->action, 0);\n+\t\tigc_del_mac_filter(adapter, input->filter.dst_addr, 0);\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 273817252823..25d0431f4f4a 100644\n--- a/drivers/net/ethernet/intel/igc/igc_main.c\n+++ b/drivers/net/ethernet/intel/igc/igc_main.c\n@@ -2210,8 +2210,8 @@ static bool igc_mac_entry_can_be_used(const struct igc_mac_addr *entry,\n *\n * In case of success, returns 0. Otherwise, it returns a negative errno code.\n */\n-static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t\t const s8 queue, const u8 flags)\n+int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n+\t\t const s8 queue, const u8 flags)\n {\n \tstruct igc_hw *hw = &adapter->hw;\n \tint rar_entries = hw->mac.rar_entry_count;\n@@ -2251,8 +2251,8 @@ static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n *\n * In case of success, returns 0. Otherwise, it returns a negative errno code.\n */\n-static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,\n-\t\t\t const u8 flags)\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@@ -3736,18 +3736,6 @@ igc_features_check(struct sk_buff *skb, struct net_device *dev,\n \treturn features;\n }\n \n-int igc_add_mac_steering_filter(struct igc_adapter *adapter,\n-\t\t\t\tconst u8 *addr, u8 queue, u8 flags)\n-{\n-\treturn igc_add_mac_filter(adapter, addr, queue, flags);\n-}\n-\n-int igc_del_mac_steering_filter(struct igc_adapter *adapter,\n-\t\t\t\tconst u8 *addr, u8 queue, u8 flags)\n-{\n-\treturn igc_del_mac_filter(adapter, addr, flags);\n-}\n-\n static void igc_tsync_interrupt(struct igc_adapter *adapter)\n {\n \tstruct igc_hw *hw = &adapter->hw;\n", "prefixes": [ "09/12" ] }