Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/609807/?format=api
{ "id": 609807, "url": "http://patchwork.ozlabs.org/api/patches/609807/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1460475052-6348-11-git-send-email-harshitha.ramamurthy@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": "<1460475052-6348-11-git-send-email-harshitha.ramamurthy@intel.com>", "list_archive_url": null, "date": "2016-04-12T15:30:49", "name": "[next,S33,10/13] i40e/i40evf: Only offload vlan tag if enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0c1a19d0ea7306e84d2b5935a2231177564fbd36", "submitter": { "id": 68642, "url": "http://patchwork.ozlabs.org/api/people/68642/?format=api", "name": "Harshitha Ramamurthy", "email": "harshitha.ramamurthy@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/1460475052-6348-11-git-send-email-harshitha.ramamurthy@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/609807/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/609807/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 3ql3H82pyLz9sRZ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Apr 2016 09:36:36 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 80A0F95C05;\n\tTue, 12 Apr 2016 23:36:35 +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 emFxVAvlZbP0; Tue, 12 Apr 2016 23:36:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 50C8F95B84;\n\tTue, 12 Apr 2016 23:36:34 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id AB38A1C0E44\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Apr 2016 23:36:32 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A6870C01CC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Apr 2016 23:36:32 +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 w4BlMNHW27NI for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Apr 2016 23:36:31 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C4070C019E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Apr 2016 23:36:31 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga103.fm.intel.com with ESMTP; 12 Apr 2016 16:36:31 -0700", "from harshitha-linux1.jf.intel.com ([10.166.45.81])\n\tby orsmga002.jf.intel.com with ESMTP; 12 Apr 2016 16:36:30 -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.24,476,1455004800\"; d=\"scan'208\";a=\"953677411\"", "From": "Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 12 Apr 2016 08:30:49 -0700", "Message-Id": "<1460475052-6348-11-git-send-email-harshitha.ramamurthy@intel.com>", "X-Mailer": "git-send-email 2.4.3", "In-Reply-To": "<1460475052-6348-1-git-send-email-harshitha.ramamurthy@intel.com>", "References": "<1460475052-6348-1-git-send-email-harshitha.ramamurthy@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S33 10/13] i40e/i40evf: Only offload\n\tvlan tag if enabled", "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: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nThe driver was offloading the vlan tag into the skb\nany time there was a vlan tag and the hardware stripping was\nenabled. Just check to make sure it's enabled before put_tag.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-Id: Ife95290c06edd9a616393b38679923938b382241\n---\nTesting Hints : Make sure ethtool control\nover RX vlan tag insertion/removal still works.\n\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 ++-\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 3 ++-\n 2 files changed, 4 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex f4af60c..05293f6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1370,7 +1370,8 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring,\n {\n \tstruct i40e_q_vector *q_vector = rx_ring->q_vector;\n \n-\tif (vlan_tag & VLAN_VID_MASK)\n+\tif ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&\n+\t (vlan_tag & VLAN_VID_MASK))\n \t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);\n \n \tnapi_gro_receive(&q_vector->napi, skb);\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 3eb39a1..e18d9d9 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -842,7 +842,8 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring,\n {\n \tstruct i40e_q_vector *q_vector = rx_ring->q_vector;\n \n-\tif (vlan_tag & VLAN_VID_MASK)\n+\tif ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&\n+\t (vlan_tag & VLAN_VID_MASK))\n \t\t__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);\n \n \tnapi_gro_receive(&q_vector->napi, skb);\n", "prefixes": [ "next", "S33", "10/13" ] }