Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/678511/?format=api
{ "id": 678511, "url": "http://patchwork.ozlabs.org/api/patches/678511/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1475685046-16900-4-git-send-email-bimmy.pujari@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": "<1475685046-16900-4-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-10-05T16:30:33", "name": "[next,S49-V2,03/15] i40e: move i40e_put_mac_in_vlan and i40e_del_mac_all_vlan", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1ae0419ad27bb3ae709640fbf9ef5fe93371e690", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1475685046-16900-4-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/678511/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/678511/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\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3sq1XJ3PC8z9sCg\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 6 Oct 2016 03:32:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CECD7C237B;\n\tWed, 5 Oct 2016 16:32:13 +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 PoyDJ-qtWoY5; Wed, 5 Oct 2016 16:32:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id E3D8BC2358;\n\tWed, 5 Oct 2016 16:32:11 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id B1BE61CE508\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AD5B78B3D5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:10 +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 mcAgWn5wIjYE for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:10 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 052408B015\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 5 Oct 2016 16:32:09 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby fmsmga105.fm.intel.com with ESMTP; 05 Oct 2016 09:32:09 -0700", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga005.fm.intel.com with ESMTP; 05 Oct 2016 09:32:09 -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.31,449,1473145200\"; d=\"scan'208\";a=\"16526362\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 5 Oct 2016 09:30:33 -0700", "Message-Id": "<1475685046-16900-4-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1475685046-16900-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1475685046-16900-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S49-V2 03/15] i40e: move\n\ti40e_put_mac_in_vlan and i40e_del_mac_all_vlan", "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: Jacob Keller <jacob.e.keller@intel.com>\n\nA future patch will be modifying these functions and making a call to\na static function which currently is defined after these functions. Move\nthem in a separate patch to ease review and ensure the moved code is\ncorrect.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I2ca7fd4e10c0c07ed2291db1ea41bf5987fc6474\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 113 ++++++++++++++--------------\n 1 file changed, 56 insertions(+), 57 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex eb05ca8..5908f7d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1208,63 +1208,6 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi)\n }\n \n /**\n- * i40e_put_mac_in_vlan - Make macvlan filters from macaddrs and vlans\n- * @vsi: the VSI to be searched\n- * @macaddr: the mac address to be filtered\n- *\n- * Goes through all the macvlan filters and adds a\n- * macvlan filter for each unique vlan that already exists\n- *\n- * Returns first filter found on success, else NULL\n- **/\n-struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n-\t\t\t\t\t const u8 *macaddr)\n-{\n-\tstruct i40e_mac_filter *f;\n-\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n-\t\tif (vsi->info.pvid)\n-\t\t\tf->vlan = le16_to_cpu(vsi->info.pvid);\n-\t\tif (!i40e_find_filter(vsi, macaddr, f->vlan)) {\n-\t\t\tif (!i40e_add_filter(vsi, macaddr, f->vlan))\n-\t\t\t\treturn NULL;\n-\t\t}\n-\t}\n-\n-\treturn list_first_entry_or_null(&vsi->mac_filter_list,\n-\t\t\t\t\tstruct i40e_mac_filter, list);\n-}\n-\n-/**\n- * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS\n- * @vsi: the VSI to be searched\n- * @macaddr: the mac address to be removed\n- *\n- * Removes a given MAC address from a VSI, regardless of VLAN\n- *\n- * Returns 0 for success, or error\n- **/\n-int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr)\n-{\n-\tstruct i40e_mac_filter *f = NULL;\n-\tint changed = 0;\n-\n-\tWARN(!spin_is_locked(&vsi->mac_filter_list_lock),\n-\t \"Missing mac_filter_list_lock\\n\");\n-\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n-\t\tif ((ether_addr_equal(macaddr, f->macaddr))) {\n-\t\t\tf->state = I40E_FILTER_REMOVE;\n-\t\t}\n-\t}\n-\tif (changed) {\n-\t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n-\t\tvsi->back->flags |= I40E_FLAG_FILTER_SYNC;\n-\t\treturn 0;\n-\t}\n-\treturn -ENOENT;\n-}\n-\n-/**\n * i40e_add_filter - Add a mac/vlan filter to the VSI\n * @vsi: the VSI to be searched\n * @macaddr: the MAC address\n@@ -1365,6 +1308,62 @@ void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan)\n }\n \n /**\n+ * i40e_put_mac_in_vlan - Make macvlan filters from macaddrs and vlans\n+ * @vsi: the VSI to be searched\n+ * @macaddr: the mac address to be filtered\n+ *\n+ * Goes through all the macvlan filters and adds a\n+ * macvlan filter for each unique vlan that already exists\n+ *\n+ * Returns first filter found on success, else NULL\n+ **/\n+struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,\n+\t\t\t\t\t const u8 *macaddr)\n+{\n+\tstruct i40e_mac_filter *f;\n+\n+\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\tif (vsi->info.pvid)\n+\t\t\tf->vlan = le16_to_cpu(vsi->info.pvid);\n+\t\tif (!i40e_find_filter(vsi, macaddr, f->vlan)) {\n+\t\t\tif (!i40e_add_filter(vsi, macaddr, f->vlan))\n+\t\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\n+\treturn list_first_entry_or_null(&vsi->mac_filter_list,\n+\t\t\t\t\tstruct i40e_mac_filter, list);\n+}\n+\n+/**\n+ * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS\n+ * @vsi: the VSI to be searched\n+ * @macaddr: the mac address to be removed\n+ *\n+ * Removes a given MAC address from a VSI, regardless of VLAN\n+ *\n+ * Returns 0 for success, or error\n+ **/\n+int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, const u8 *macaddr)\n+{\n+\tstruct i40e_mac_filter *f = NULL;\n+\tint changed = 0;\n+\n+\tWARN(!spin_is_locked(&vsi->mac_filter_list_lock),\n+\t \"Missing mac_filter_list_lock\\n\");\n+\tlist_for_each_entry(f, &vsi->mac_filter_list, list) {\n+\t\tif (ether_addr_equal(macaddr, f->macaddr))\n+\t\t\tf->state = I40E_FILTER_REMOVE;\n+\t}\n+\tif (changed) {\n+\t\tvsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;\n+\t\tvsi->back->flags |= I40E_FLAG_FILTER_SYNC;\n+\t\treturn 0;\n+\t}\n+\treturn -ENOENT;\n+}\n+\n+/**\n * i40e_set_mac - NDO callback to set mac address\n * @netdev: network interface device structure\n * @p: pointer to an address structure\n", "prefixes": [ "next", "S49-V2", "03/15" ] }