Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/499529/?format=api
{ "id": 499529, "url": "http://patchwork.ozlabs.org/api/patches/499529/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1437684884-222825-8-git-send-email-catherine.sullivan@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": "<1437684884-222825-8-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-07-23T20:54:36", "name": "[next,S9,07/15] i40e: use qos field consistently", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1186187fbcf959d9bebdbfc61ea543213053f09f", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1437684884-222825-8-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/499529/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/499529/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\tby ozlabs.org (Postfix) with ESMTP id 425CF140D19\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 24 Jul 2015 06:53:49 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 95096A43A9;\n\tThu, 23 Jul 2015 20:53:48 +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 qtdinJdJenLf; Thu, 23 Jul 2015 20:53:48 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 31F39A438E;\n\tThu, 23 Jul 2015 20:53:48 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 205D91BFA6C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:47 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1A21D91FF8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:47 +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 nS0L2o92dmeT for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:46 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 84F9891FF1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 23 Jul 2015 20:53:46 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 23 Jul 2015 13:53:46 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jul 2015 13:53:46 -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.15,533,1432623600\"; d=\"scan'208\";a=\"753353343\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 23 Jul 2015 16:54:36 -0400", "Message-Id": "<1437684884-222825-8-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1437684884-222825-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S9 07/15] i40e: use qos field\n\tconsistently", "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: Mitch Williams <mitch.a.williams@intel.com>\n\nIn i40e_ndo_set_vf_port_vlan, we were using the qos value\ninconsistently, sometimes shifting it, sometimes not. Do the shift-and-\nor operation correctly, once, and use the result consistently everywhere\n in the function.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\nChange-ID: I46f062f3edc90a8a017ecec9137f4d1ab0ab9e41\n---\n drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex d99c116..f60cd43 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -2089,6 +2089,7 @@ error_param:\n int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,\n \t\t\t int vf_id, u16 vlan_id, u8 qos)\n {\n+\tu16 vlanprio = vlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT);\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_pf *pf = np->vsi->back;\n \tstruct i40e_vsi *vsi;\n@@ -2116,8 +2117,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,\n \t\tgoto error_pvid;\n \t}\n \n-\tif (le16_to_cpu(vsi->info.pvid) ==\n-\t (vlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT)))\n+\tif (le16_to_cpu(vsi->info.pvid) == vlanprio)\n \t\t/* duplicate request, so just return success */\n \t\tgoto error_pvid;\n \n@@ -2141,7 +2141,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,\n \t * MAC addresses deleted.\n \t */\n \tif ((!(vlan_id || qos) ||\n-\t (vlan_id | qos) != le16_to_cpu(vsi->info.pvid)) &&\n+\t vlanprio != le16_to_cpu(vsi->info.pvid)) &&\n \t vsi->info.pvid)\n \t\tret = i40e_vsi_add_vlan(vsi, I40E_VLAN_ANY);\n \n@@ -2156,8 +2156,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,\n \t\t}\n \t}\n \tif (vlan_id || qos)\n-\t\tret = i40e_vsi_add_pvid(vsi,\n-\t\t\t\tvlan_id | (qos << I40E_VLAN_PRIORITY_SHIFT));\n+\t\tret = i40e_vsi_add_pvid(vsi, vlanprio);\n \telse\n \t\ti40e_vsi_remove_pvid(vsi);\n \n", "prefixes": [ "next", "S9", "07/15" ] }