Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/780098/?format=api
{ "id": 780098, "url": "http://patchwork.ozlabs.org/api/patches/780098/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170623082451.32671-10-alice.michael@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": "<20170623082451.32671-10-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-06-23T08:24:51", "name": "[next,S74-V2,10/10] i40e: move check for avoiding VID=0 filters into i40e_vsi_add_vlan", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "87d698b2df8ab268b57fd411757b03422737f0d5", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20170623082451.32671-10-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/780098/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/780098/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" ], "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 3wvP6M4thmz9sNW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 24 Jun 2017 02:29:15 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3DCD7878FA;\n\tFri, 23 Jun 2017 16:29:14 +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 HLzNFlPSvqOJ; Fri, 23 Jun 2017 16:29:13 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AD8CD877B5;\n\tFri, 23 Jun 2017 16:29:13 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id A73021C26F5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:29:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9FC0E881FA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:29:12 +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 4hXAw5IUCm2L for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:29:12 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id ED579881F3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:29:11 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jun 2017 09:29:11 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jun 2017 09:29:11 -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.39,379,1493708400\"; d=\"scan'208\";\n\ta=\"1163959013\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 23 Jun 2017 04:24:51 -0400", "Message-Id": "<20170623082451.32671-10-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170623082451.32671-1-alice.michael@intel.com>", "References": "<20170623082451.32671-1-alice.michael@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S74-V2 10/10] i40e: move check for\n\tavoiding VID=0 filters into i40e_vsi_add_vlan", "X-BeenThere": "intel-wired-lan@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.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>", "MIME-Version": "1.0", "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": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nIn i40e_vsi_add_vlan we treat attempting to add VID=0 as an error,\nbecause it does not do what the caller might expect. We already special\ncase VID=0 in i40e_vlan_rx_add_vid so that we avoid this error when\nadding the VLAN.\n\nThis special casing is necessary so that we do not add the VLAN=0 filter\nsince we don't want to stop receiving untagged traffic. Unfortunately,\nnot all callers of i40e_vsi_add_vlan are aware of this, including when\nwe add VLANs from a VF device.\n\nRather than special casing every single caller of i40e_vsi_add_vlan,\nlets just move this check internally. This makes the code simpler\nbecause the caller does not need to be aware of how VLAN=0 is special,\nand we don't forget to add this check in new places.\n\nThis fixes a harmless error message displaying when adding a VLAN from\nwithin a VF. The message was meaningless but there is no reason to\nconfuse end users and system administrators, and this is now avoided.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 23 +++++++++++++----------\n 1 file changed, 13 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex ffd4891..bd22a90 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2596,9 +2596,20 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, u16 vid)\n {\n \tint err;\n \n-\tif (!vid || vsi->info.pvid)\n+\tif (vsi->info.pvid)\n \t\treturn -EINVAL;\n \n+\t/* The network stack will attempt to add VID=0, with the intention to\n+\t * receive priority tagged packets with a VLAN of 0. Our HW receives\n+\t * these packets by default when configured to receive untagged\n+\t * packets, so we don't need to add a filter for this case.\n+\t * Additionally, HW interprets adding a VID=0 filter as meaning to\n+\t * receive *only* tagged traffic and stops receiving untagged traffic.\n+\t * Thus, we do not want to actually add a filter for VID=0\n+\t */\n+\tif (!vid)\n+\t\treturn 0;\n+\n \t/* Locked once because all functions invoked below iterates list*/\n \tspin_lock_bh(&vsi->mac_filter_hash_lock);\n \terr = i40e_add_vlan_all_mac(vsi, vid);\n@@ -2675,15 +2686,7 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev,\n \tif (vid >= VLAN_N_VID)\n \t\treturn -EINVAL;\n \n-\t/* If the network stack called us with vid = 0 then\n-\t * it is asking to receive priority tagged packets with\n-\t * vlan id 0. Our HW receives them by default when configured\n-\t * to receive untagged packets so there is no need to add an\n-\t * extra filter for vlan 0 tagged packets.\n-\t */\n-\tif (vid)\n-\t\tret = i40e_vsi_add_vlan(vsi, vid);\n-\n+\tret = i40e_vsi_add_vlan(vsi, vid);\n \tif (!ret)\n \t\tset_bit(vid, vsi->active_vlans);\n \n", "prefixes": [ "next", "S74-V2", "10/10" ] }