Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/661644/?format=api
{ "id": 661644, "url": "http://patchwork.ozlabs.org/api/patches/661644/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160822231746.7715.25120.stgit@localhost6.localdomain6/", "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": "<20160822231746.7715.25120.stgit@localhost6.localdomain6>", "list_archive_url": null, "date": "2016-08-22T23:17:46", "name": "ixgbe: simplify the logic for setting VLAN filtering", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "33c1b70b4d9b33c2663c798f16f824bf37f908f8", "submitter": { "id": 1670, "url": "http://patchwork.ozlabs.org/api/people/1670/?format=api", "name": "Tantilov, Emil S", "email": "emil.s.tantilov@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/20160822231746.7715.25120.stgit@localhost6.localdomain6/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/661644/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/661644/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 3sJ8YT3hGSz9t0p\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 23 Aug 2016 09:15:09 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 907B9313C9;\n\tMon, 22 Aug 2016 23:15:07 +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 NHWh014829yJ; Mon, 22 Aug 2016 23:15:06 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id ACEF9313E0;\n\tMon, 22 Aug 2016 23:15:06 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 313C41C2BE5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 22 Aug 2016 23:15:05 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 2A35C313C9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 22 Aug 2016 23:15:05 +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 4ybPEZt8RVXY for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 22 Aug 2016 23:15:04 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 5F99230ABA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 22 Aug 2016 23:15:04 +0000 (UTC)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby orsmga102.jf.intel.com with ESMTP; 22 Aug 2016 16:15:04 -0700", "from estantil-desk3.jf.intel.com (HELO localhost6.localdomain6)\n\t([134.134.3.186])\n\tby fmsmga006.fm.intel.com with ESMTP; 22 Aug 2016 16:15:03 -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.28,562,1464678000\"; d=\"scan'208\";a=\"696841\"", "From": "Emil Tantilov <emil.s.tantilov@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 22 Aug 2016 16:17:46 -0700", "Message-ID": "<20160822231746.7715.25120.stgit@localhost6.localdomain6>", "User-Agent": "StGit/0.17.1-17-ge4e0", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: simplify the logic for setting\n\tVLAN filtering", "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>", "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": "Simplify the logic for setting VLNCTRL.VFE by checking the VMDQ flag\nand 82598 MAC instead of having to maintain a list of MAC types.\n\nSigned-off-by: Emil Tantilov <emil.s.tantilov@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 39 +++++++------------------\n 1 file changed, 11 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex d76bc1a..1c88858 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -4105,23 +4105,20 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter)\n \n \tvlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);\n \n-\tswitch (hw->mac.type) {\n-\tcase ixgbe_mac_82599EB:\n-\tcase ixgbe_mac_X540:\n-\tcase ixgbe_mac_X550:\n-\tcase ixgbe_mac_X550EM_x:\n-\tcase ixgbe_mac_x550em_a:\n-\tdefault:\n-\t\tif (adapter->flags & IXGBE_FLAG_VMDQ_ENABLED)\n-\t\t\tbreak;\n-\t\t/* fall through */\n-\tcase ixgbe_mac_82598EB:\n-\t\t/* legacy case, we can just disable VLAN filtering */\n+\tif (adapter->flags & IXGBE_FLAG_VMDQ_ENABLED) {\n+\t/* For VMDq and SR-IOV we must leave VLAN filtering enabled */\n+\t\tvlnctrl |= IXGBE_VLNCTRL_VFE;\n+\t\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n+\t} else {\n \t\tvlnctrl &= ~IXGBE_VLNCTRL_VFE;\n \t\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n \t\treturn;\n \t}\n \n+\t/* Nothing to do for 82598 */\n+\tif (hw->mac.type == ixgbe_mac_82598EB)\n+\t\treturn;\n+\n \t/* We are already in VLAN promisc, nothing to do */\n \tif (adapter->flags2 & IXGBE_FLAG2_VLAN_PROMISC)\n \t\treturn;\n@@ -4129,10 +4126,6 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter)\n \t/* Set flag so we don't redo unnecessary work */\n \tadapter->flags2 |= IXGBE_FLAG2_VLAN_PROMISC;\n \n-\t/* For VMDq and SR-IOV we must leave VLAN filtering enabled */\n-\tvlnctrl |= IXGBE_VLNCTRL_VFE;\n-\tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n-\n \t/* Add PF to all active pools */\n \tfor (i = IXGBE_VLVF_ENTRIES; --i;) {\n \t\tu32 reg_offset = IXGBE_VLVFB(i * 2 + VMDQ_P(0) / 32);\n@@ -4204,19 +4197,9 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter)\n \tvlnctrl |= IXGBE_VLNCTRL_VFE;\n \tIXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);\n \n-\tswitch (hw->mac.type) {\n-\tcase ixgbe_mac_82599EB:\n-\tcase ixgbe_mac_X540:\n-\tcase ixgbe_mac_X550:\n-\tcase ixgbe_mac_X550EM_x:\n-\tcase ixgbe_mac_x550em_a:\n-\tdefault:\n-\t\tif (adapter->flags & IXGBE_FLAG_VMDQ_ENABLED)\n-\t\t\tbreak;\n-\t\t/* fall through */\n-\tcase ixgbe_mac_82598EB:\n+\tif (!(adapter->flags & IXGBE_FLAG_VMDQ_ENABLED) ||\n+\t hw->mac.type == ixgbe_mac_82598EB)\n \t\treturn;\n-\t}\n \n \t/* We are not in VLAN promisc, nothing to do */\n \tif (!(adapter->flags2 & IXGBE_FLAG2_VLAN_PROMISC))\n", "prefixes": [] }