Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/692498/?format=api
{ "id": 692498, "url": "http://patchwork.ozlabs.org/api/patches/692498/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478639119-14656-14-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": "<1478639119-14656-14-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-08T21:05:17", "name": "[next,S52-V2,13/15] i40e: remove code to handle dev_addr specially", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8a58ea78f5860f46be16ad19e43d0b8872171cda", "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/1478639119-14656-14-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/692498/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/692498/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 3tD21m4F1Pz9t1Q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 9 Nov 2016 08:07:08 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F163CC125F;\n\tTue, 8 Nov 2016 21:07:06 +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 tnP4BGxNuHa1; Tue, 8 Nov 2016 21:07:04 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 534BEC1374;\n\tTue, 8 Nov 2016 21:07:03 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id BAEE91CF6CD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B86032E50D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:59 +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 tpe+vkHcK0zL for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:56 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 7AE5531C5F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:55 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga105.fm.intel.com with ESMTP; 08 Nov 2016 13:06:55 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga002.fm.intel.com with ESMTP; 08 Nov 2016 13:06:54 -0800" ], "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,611,1473145200\"; d=\"scan'208\";\n\ta=\"1082486435\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 8 Nov 2016 13:05:17 -0800", "Message-Id": "<1478639119-14656-14-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478639119-14656-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478639119-14656-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S52-V2 13/15] i40e: remove code to\n\thandle dev_addr specially", "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\nThe netdev->dev_addr MAC filter already exists in the\nMAC/VLAN hash table, as it is added when we configure\nthe netdev in i40e_configure_netdev. Because we already\nknow that this address will be updated in the\nhash_for_each loops, we do not need to handle it\nspecially. This removes duplicate code and simplifies\nthe i40e_vsi_add_vlan and i40e_vsi_kill_vlan functions.\nBecause we know these filters must be part of the\nMAC/VLAN hash table, this should not have any functional\nimpact on what filters are included and is merely a code\nsimplification.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I5e648302dbdd7cc29efc6d203b7019c11f0b5705\n---\nTesting-hints:\n Ensure that adding and removing VLANs correctly updates the filters\n for the MAC address of the device.\n\n drivers/net/ethernet/intel/i40e/i40e_main.c | 43 +++++------------------------\n 1 file changed, 7 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex ef6eb19..eddb14c 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2503,17 +2503,6 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t/* Locked once because all functions invoked below iterates list*/\n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n-\tif (vsi->netdev) {\n-\t\tadd_f = i40e_add_filter(vsi, vsi->netdev->dev_addr, vid);\n-\t\tif (!add_f) {\n-\t\t\tdev_info(&vsi->back->pdev->dev,\n-\t\t\t\t \"Could not add vlan filter %d for %pM\\n\",\n-\t\t\t\t vid, vsi->netdev->dev_addr);\n-\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\t}\n-\n \thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (f->state == I40E_FILTER_REMOVE)\n \t\t\tcontinue;\n@@ -2527,28 +2516,14 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n \t\t}\n \t}\n \n-\t/* Now if we add a vlan tag, make sure to check if it is the first\n-\t * tag (i.e. a \"tag\" -1 does exist) and if so replace the -1 \"tag\"\n-\t * with 0, so we now accept untagged and specified tagged traffic\n-\t * (and not all tags along with untagged)\n+\t/* When we add a new VLAN filter, we need to make sure that all existing\n+\t * filters which are marked as vid=-1 (I40E_VLAN_ANY) are converted to\n+\t * vid=0. The simplest way is just search for all filters marked as\n+\t * vid=-1 and replace them with vid=0. This converts all filters that\n+\t * were marked to receive all traffic (tagged or untagged) into\n+\t * filters to receive only untagged traffic, so that we don't receive\n+\t * tagged traffic for VLANs which we have not configured.\n \t */\n-\tif (vid > 0 && vsi->netdev) {\n-\t\tdel_f = i40e_find_filter(vsi, vsi->netdev->dev_addr,\n-\t\t\t\t\t I40E_VLAN_ANY);\n-\t\tif (del_f) {\n-\t\t\t__i40e_del_filter(vsi, del_f);\n-\t\t\tadd_f = i40e_add_filter(vsi, vsi->netdev->dev_addr, 0);\n-\t\t\tif (!add_f) {\n-\t\t\t\tdev_info(&vsi->back->pdev->dev,\n-\t\t\t\t\t \"Could not add filter 0 for %pM\\n\",\n-\t\t\t\t\t vsi->netdev->dev_addr);\n-\t\t\t\tspin_unlock_bh(&vsi->mac_filter_hash_lock);\n-\t\t\t\treturn -ENOMEM;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t/* Do not assume that I40E_VLAN_ANY should be reset to VLAN 0 */\n \tif (vid > 0 && !vsi->info.pvid) {\n \t\thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\t\tif (f->state == I40E_FILTER_REMOVE)\n@@ -2585,7 +2560,6 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)\n **/\n void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n {\n-\tstruct net_device *netdev = vsi->netdev;\n \tstruct i40e_mac_filter *f;\n \tstruct hlist_node *h;\n \tint bkt;\n@@ -2593,9 +2567,6 @@ void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)\n \t/* Locked once because all functions invoked below iterates list */\n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \n-\tif (vsi->netdev)\n-\t\ti40e_del_filter(vsi, netdev->dev_addr, vid);\n-\n \thash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {\n \t\tif (f->vlan == vid)\n \t\t\t__i40e_del_filter(vsi, f);\n", "prefixes": [ "next", "S52-V2", "13/15" ] }