Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/461885/?format=api
{ "id": 461885, "url": "http://patchwork.ozlabs.org/api/patches/461885/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1429229172-143692-4-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": "<1429229172-143692-4-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-17T00:06:00", "name": "[net-next,S4,03/15] i40e/i40evf: Add ATR support for tunneled TCP/IPv4/IPv6 packets.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "33d98397b74349abe0fade5200dfcea7e1672502", "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/1429229172-143692-4-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/461885/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/461885/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 (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id EA3181402A6\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 17 Apr 2015 10:03:13 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4374589E6E;\n\tFri, 17 Apr 2015 00:03:13 +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 xhrPo2ZbCXHO; Fri, 17 Apr 2015 00:03:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6B18889E86;\n\tFri, 17 Apr 2015 00:03:12 +0000 (UTC)", "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 97CB71C223A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9450C89E8A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:10 +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 urpTH2a5iSb2 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:09 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AB2FD89E88\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 17 Apr 2015 00:03:09 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 16 Apr 2015 17:03:09 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 16 Apr 2015 17:03:09 -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.11,591,1422950400\"; d=\"scan'208\";a=\"481989609\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 16 Apr 2015 20:06:00 -0400", "Message-Id": "<1429229172-143692-4-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1429229172-143692-1-git-send-email-catherine.sullivan@intel.com>", "Cc": "Anjali Singhai Jain <anjali.singhai@intel.com>", "Subject": "[Intel-wired-lan] [net-next S4 03/15] i40e/i40evf: Add ATR support\n\tfor tunneled TCP/IPv4/IPv6 packets.", "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: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nWithout this RSS would have done inner header load balancing. Now we can get the\nbenefits of ATR for tunneled packets to better align TX and RX queues with the\nright core/interrupt.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: I07d0e0a192faf28fdd33b2f04c32b2a82ff97ddd\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 77 +++++++++++++++------------\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 +\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 34 ++++++------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 +\n 4 files changed, 62 insertions(+), 51 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 4bd3a80..f188790 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1925,11 +1925,11 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)\n * i40e_atr - Add a Flow Director ATR filter\n * @tx_ring: ring to add programming descriptor to\n * @skb: send buffer\n- * @flags: send flags\n+ * @tx_flags: send tx flags\n * @protocol: wire protocol\n **/\n static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t u32 flags, __be16 protocol)\n+\t\t u32 tx_flags, __be16 protocol)\n {\n \tstruct i40e_filter_program_desc *fdir_desc;\n \tstruct i40e_pf *pf = tx_ring->vsi->back;\n@@ -1954,25 +1954,38 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \tif (!tx_ring->atr_sample_rate)\n \t\treturn;\n \n-\t/* snag network header to get L4 type and address */\n-\thdr.network = skb_network_header(skb);\n+\tif (!(tx_flags & (I40E_TX_FLAGS_IPV4 | I40E_TX_FLAGS_IPV6)))\n+\t\treturn;\n \n-\t/* Currently only IPv4/IPv6 with TCP is supported */\n-\tif (protocol == htons(ETH_P_IP)) {\n-\t\tif (hdr.ipv4->protocol != IPPROTO_TCP)\n-\t\t\treturn;\n+\tif (!(tx_flags & I40E_TX_FLAGS_VXLAN_TUNNEL)) {\n+\t\t/* snag network header to get L4 type and address */\n+\t\thdr.network = skb_network_header(skb);\n \n-\t\t/* access ihl as a u8 to avoid unaligned access on ia64 */\n-\t\thlen = (hdr.network[0] & 0x0F) << 2;\n-\t} else if (protocol == htons(ETH_P_IPV6)) {\n-\t\tif (hdr.ipv6->nexthdr != IPPROTO_TCP)\n+\t\t/* Currently only IPv4/IPv6 with TCP is supported\n+\t\t * access ihl as u8 to avoid unaligned access on ia64\n+\t\t */\n+\t\tif (tx_flags & I40E_TX_FLAGS_IPV4)\n+\t\t\thlen = (hdr.network[0] & 0x0F) << 2;\n+\t\telse if (protocol == htons(ETH_P_IPV6))\n+\t\t\thlen = sizeof(struct ipv6hdr);\n+\t\telse\n \t\t\treturn;\n-\n-\t\thlen = sizeof(struct ipv6hdr);\n \t} else {\n-\t\treturn;\n+\t\thdr.network = skb_inner_network_header(skb);\n+\t\thlen = skb_inner_network_header_len(skb);\n \t}\n \n+\t/* Currently only IPv4/IPv6 with TCP is supported\n+\t * Note: tx_flags gets modified to reflect inner protocols in\n+\t * tx_enable_csum function if encap is enabled.\n+\t */\n+\tif ((tx_flags & I40E_TX_FLAGS_IPV4) &&\n+\t (hdr.ipv4->protocol != IPPROTO_TCP))\n+\t\treturn;\n+\telse if ((tx_flags & I40E_TX_FLAGS_IPV6) &&\n+\t\t (hdr.ipv6->nexthdr != IPPROTO_TCP))\n+\t\treturn;\n+\n \tth = (struct tcphdr *)(hdr.network + hlen);\n \n \t/* Due to lack of space, no more new filters can be programmed */\n@@ -2119,16 +2132,14 @@ out:\n * i40e_tso - set up the tso context descriptor\n * @tx_ring: ptr to the ring to send\n * @skb: ptr to the skb we're sending\n- * @tx_flags: the collected send information\n- * @protocol: the send protocol\n * @hdr_len: ptr to the size of the packet header\n * @cd_tunneling: ptr to context descriptor bits\n *\n * Returns 0 if no TSO can happen, 1 if tso is going, or error\n **/\n static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t u32 tx_flags, __be16 protocol, u8 *hdr_len,\n-\t\t u64 *cd_type_cmd_tso_mss, u32 *cd_tunneling)\n+\t\t u8 *hdr_len, u64 *cd_type_cmd_tso_mss,\n+\t\t u32 *cd_tunneling)\n {\n \tu32 cd_cmd, cd_tso_len, cd_mss;\n \tstruct ipv6hdr *ipv6h;\n@@ -2220,12 +2231,12 @@ static int i40e_tsyn(struct i40e_ring *tx_ring, struct sk_buff *skb,\n /**\n * i40e_tx_enable_csum - Enable Tx checksum offloads\n * @skb: send buffer\n- * @tx_flags: Tx flags currently set\n+ * @tx_flags: pointer to Tx flags currently set\n * @td_cmd: Tx descriptor command bits to set\n * @td_offset: Tx descriptor header offsets to set\n * @cd_tunneling: ptr to context desc bits\n **/\n-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n+static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t\tu32 *td_cmd, u32 *td_offset,\n \t\t\t\tstruct i40e_ring *tx_ring,\n \t\t\t\tu32 *cd_tunneling)\n@@ -2241,6 +2252,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\tswitch (ip_hdr(skb)->protocol) {\n \t\tcase IPPROTO_UDP:\n \t\t\tl4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\treturn;\n@@ -2250,18 +2262,17 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\tthis_ipv6_hdr = inner_ipv6_hdr(skb);\n \t\tthis_tcp_hdrlen = inner_tcp_hdrlen(skb);\n \n-\t\tif (tx_flags & I40E_TX_FLAGS_IPV4) {\n-\n-\t\t\tif (tx_flags & I40E_TX_FLAGS_TSO) {\n+\t\tif (*tx_flags & I40E_TX_FLAGS_IPV4) {\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO) {\n \t\t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;\n \t\t\t\tip_hdr(skb)->check = 0;\n \t\t\t} else {\n \t\t\t\t*cd_tunneling |=\n \t\t\t\t\t I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;\n \t\t\t}\n-\t\t} else if (tx_flags & I40E_TX_FLAGS_IPV6) {\n+\t\t} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {\n \t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;\n-\t\t\tif (tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n \t\t\t\tip_hdr(skb)->check = 0;\n \t\t}\n \n@@ -2273,8 +2284,8 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\t\t\t\tskb_transport_offset(skb)) >> 1) <<\n \t\t\t\t I40E_TXD_CTX_QW0_NATLEN_SHIFT;\n \t\tif (this_ip_hdr->version == 6) {\n-\t\t\ttx_flags &= ~I40E_TX_FLAGS_IPV4;\n-\t\t\ttx_flags |= I40E_TX_FLAGS_IPV6;\n+\t\t\t*tx_flags &= ~I40E_TX_FLAGS_IPV4;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_IPV6;\n \t\t}\n \t} else {\n \t\tnetwork_hdr_len = skb_network_header_len(skb);\n@@ -2284,12 +2295,12 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t}\n \n \t/* Enable IP checksum offloads */\n-\tif (tx_flags & I40E_TX_FLAGS_IPV4) {\n+\tif (*tx_flags & I40E_TX_FLAGS_IPV4) {\n \t\tl4_hdr = this_ip_hdr->protocol;\n \t\t/* the stack computes the IP header already, the only time we\n \t\t * need the hardware to recompute it is in the case of TSO.\n \t\t */\n-\t\tif (tx_flags & I40E_TX_FLAGS_TSO) {\n+\t\tif (*tx_flags & I40E_TX_FLAGS_TSO) {\n \t\t\t*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;\n \t\t\tthis_ip_hdr->check = 0;\n \t\t} else {\n@@ -2298,7 +2309,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\t/* Now set the td_offset for IP header length */\n \t\t*td_offset = (network_hdr_len >> 2) <<\n \t\t\t I40E_TX_DESC_LENGTH_IPLEN_SHIFT;\n-\t} else if (tx_flags & I40E_TX_FLAGS_IPV6) {\n+\t} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {\n \t\tl4_hdr = this_ipv6_hdr->nexthdr;\n \t\t*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV6;\n \t\t/* Now set the td_offset for IP header length */\n@@ -2711,7 +2722,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \telse if (protocol == htons(ETH_P_IPV6))\n \t\ttx_flags |= I40E_TX_FLAGS_IPV6;\n \n-\ttso = i40e_tso(tx_ring, skb, tx_flags, protocol, &hdr_len,\n+\ttso = i40e_tso(tx_ring, skb, &hdr_len,\n \t\t &cd_type_cmd_tso_mss, &cd_tunneling);\n \n \tif (tso < 0)\n@@ -2737,7 +2748,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n \t\ttx_flags |= I40E_TX_FLAGS_CSUM;\n \n-\t\ti40e_tx_enable_csum(skb, tx_flags, &td_cmd, &td_offset,\n+\t\ti40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n \t\t\t\t tx_ring, &cd_tunneling);\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex 4b0b810..ea1df3b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -139,6 +139,7 @@ enum i40e_dyn_idx_t {\n #define I40E_TX_FLAGS_FSO\t\t(u32)(1 << 7)\n #define I40E_TX_FLAGS_TSYN\t\t(u32)(1 << 8)\n #define I40E_TX_FLAGS_FD_SB\t\t(u32)(1 << 9)\n+#define I40E_TX_FLAGS_VXLAN_TUNNEL\t(u32)(1 << 10)\n #define I40E_TX_FLAGS_VLAN_MASK\t\t0xffff0000\n #define I40E_TX_FLAGS_VLAN_PRIO_MASK\t0xe0000000\n #define I40E_TX_FLAGS_VLAN_PRIO_SHIFT\t29\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex b077e02..362d6e1 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1408,16 +1408,14 @@ out:\n * i40e_tso - set up the tso context descriptor\n * @tx_ring: ptr to the ring to send\n * @skb: ptr to the skb we're sending\n- * @tx_flags: the collected send information\n- * @protocol: the send protocol\n * @hdr_len: ptr to the size of the packet header\n * @cd_tunneling: ptr to context descriptor bits\n *\n * Returns 0 if no TSO can happen, 1 if tso is going, or error\n **/\n static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,\n-\t\t u32 tx_flags, __be16 protocol, u8 *hdr_len,\n-\t\t u64 *cd_type_cmd_tso_mss, u32 *cd_tunneling)\n+\t\t u8 *hdr_len, u64 *cd_type_cmd_tso_mss,\n+\t\t u32 *cd_tunneling)\n {\n \tu32 cd_cmd, cd_tso_len, cd_mss;\n \tstruct ipv6hdr *ipv6h;\n@@ -1468,12 +1466,12 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,\n /**\n * i40e_tx_enable_csum - Enable Tx checksum offloads\n * @skb: send buffer\n- * @tx_flags: Tx flags currently set\n+ * @tx_flags: pointer to Tx flags currently set\n * @td_cmd: Tx descriptor command bits to set\n * @td_offset: Tx descriptor header offsets to set\n * @cd_tunneling: ptr to context desc bits\n **/\n-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n+static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t\tu32 *td_cmd, u32 *td_offset,\n \t\t\t\tstruct i40e_ring *tx_ring,\n \t\t\t\tu32 *cd_tunneling)\n@@ -1489,6 +1487,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\tswitch (ip_hdr(skb)->protocol) {\n \t\tcase IPPROTO_UDP:\n \t\t\tl4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\treturn;\n@@ -1498,18 +1497,17 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\tthis_ipv6_hdr = inner_ipv6_hdr(skb);\n \t\tthis_tcp_hdrlen = inner_tcp_hdrlen(skb);\n \n-\t\tif (tx_flags & I40E_TX_FLAGS_IPV4) {\n-\n-\t\t\tif (tx_flags & I40E_TX_FLAGS_TSO) {\n+\t\tif (*tx_flags & I40E_TX_FLAGS_IPV4) {\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO) {\n \t\t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;\n \t\t\t\tip_hdr(skb)->check = 0;\n \t\t\t} else {\n \t\t\t\t*cd_tunneling |=\n \t\t\t\t\t I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;\n \t\t\t}\n-\t\t} else if (tx_flags & I40E_TX_FLAGS_IPV6) {\n+\t\t} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {\n \t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;\n-\t\t\tif (tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n \t\t\t\tip_hdr(skb)->check = 0;\n \t\t}\n \n@@ -1521,8 +1519,8 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\t\t\t\tskb_transport_offset(skb)) >> 1) <<\n \t\t\t\t I40E_TXD_CTX_QW0_NATLEN_SHIFT;\n \t\tif (this_ip_hdr->version == 6) {\n-\t\t\ttx_flags &= ~I40E_TX_FLAGS_IPV4;\n-\t\t\ttx_flags |= I40E_TX_FLAGS_IPV6;\n+\t\t\t*tx_flags &= ~I40E_TX_FLAGS_IPV4;\n+\t\t\t*tx_flags |= I40E_TX_FLAGS_IPV6;\n \t\t}\n \n \n@@ -1534,12 +1532,12 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t}\n \n \t/* Enable IP checksum offloads */\n-\tif (tx_flags & I40E_TX_FLAGS_IPV4) {\n+\tif (*tx_flags & I40E_TX_FLAGS_IPV4) {\n \t\tl4_hdr = this_ip_hdr->protocol;\n \t\t/* the stack computes the IP header already, the only time we\n \t\t * need the hardware to recompute it is in the case of TSO.\n \t\t */\n-\t\tif (tx_flags & I40E_TX_FLAGS_TSO) {\n+\t\tif (*tx_flags & I40E_TX_FLAGS_TSO) {\n \t\t\t*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;\n \t\t\tthis_ip_hdr->check = 0;\n \t\t} else {\n@@ -1548,7 +1546,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,\n \t\t/* Now set the td_offset for IP header length */\n \t\t*td_offset = (network_hdr_len >> 2) <<\n \t\t\t I40E_TX_DESC_LENGTH_IPLEN_SHIFT;\n-\t} else if (tx_flags & I40E_TX_FLAGS_IPV6) {\n+\t} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {\n \t\tl4_hdr = this_ipv6_hdr->nexthdr;\n \t\t*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV6;\n \t\t/* Now set the td_offset for IP header length */\n@@ -1942,7 +1940,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \telse if (protocol == htons(ETH_P_IPV6))\n \t\ttx_flags |= I40E_TX_FLAGS_IPV6;\n \n-\ttso = i40e_tso(tx_ring, skb, tx_flags, protocol, &hdr_len,\n+\ttso = i40e_tso(tx_ring, skb, &hdr_len,\n \t\t &cd_type_cmd_tso_mss, &cd_tunneling);\n \n \tif (tso < 0)\n@@ -1963,7 +1961,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n \t\ttx_flags |= I40E_TX_FLAGS_CSUM;\n \n-\t\ti40e_tx_enable_csum(skb, tx_flags, &td_cmd, &td_offset,\n+\t\ti40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n \t\t\t\t tx_ring, &cd_tunneling);\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\nindex 1e49bb1..a23f5e8 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n@@ -138,6 +138,7 @@ enum i40e_dyn_idx_t {\n #define I40E_TX_FLAGS_FCCRC\t\t(u32)(1 << 6)\n #define I40E_TX_FLAGS_FSO\t\t(u32)(1 << 7)\n #define I40E_TX_FLAGS_FD_SB\t\t(u32)(1 << 9)\n+#define I40E_TX_FLAGS_VXLAN_TUNNEL\t(u32)(1 << 10)\n #define I40E_TX_FLAGS_VLAN_MASK\t\t0xffff0000\n #define I40E_TX_FLAGS_VLAN_PRIO_MASK\t0xe0000000\n #define I40E_TX_FLAGS_VLAN_PRIO_SHIFT\t29\n", "prefixes": [ "net-next", "S4", "03/15" ] }