netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: netdev@vger.kernel.org
Cc: linux-wireless@vger.kernel.org, egrumbach@gmail.com,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH v2] net: tso: add support for IPv6
Date: Sun, 25 Oct 2015 22:02:51 +0200	[thread overview]
Message-ID: <1445803371-19778-1-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1445803107-18513-1-git-send-email-emmanuel.grumbach@intel.com>

Adding IPv6 for the TSO helper API is trivial:
* Don't play with the id (which doesn't exist in IPv6)
* Correctly update the payload_len (don't include the
  length of the IP header itself)

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
v2: add else if

NOTE: instead of checking the skb->protocol, I can add a bool
	in tso_t. This might be better in terms of cache
	handling. Let me know if you prefer that option
---
 net/core/tso.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/net/core/tso.c b/net/core/tso.c
index 630b30b..bf71bdc5 100644
--- a/net/core/tso.c
+++ b/net/core/tso.c
@@ -14,18 +14,24 @@ EXPORT_SYMBOL(tso_count_descs);
 void tso_build_hdr(struct sk_buff *skb, char *hdr, struct tso_t *tso,
 		   int size, bool is_last)
 {
-	struct iphdr *iph;
 	struct tcphdr *tcph;
 	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
 	int mac_hdr_len = skb_network_offset(skb);
 
 	memcpy(hdr, skb->data, hdr_len);
-	iph = (struct iphdr *)(hdr + mac_hdr_len);
-	iph->id = htons(tso->ip_id);
-	iph->tot_len = htons(size + hdr_len - mac_hdr_len);
+	if (skb->protocol == htons(ETH_P_IP)) {
+		struct iphdr *iph = (void *)(hdr + mac_hdr_len);
+
+		iph->id = htons(tso->ip_id);
+		iph->tot_len = htons(size + hdr_len - mac_hdr_len);
+		tso->ip_id++;
+	} else if (skb->protocol == htons(ETH_P_IPV6)) {
+		struct ipv6hdr *iph = (void *)(hdr + mac_hdr_len);
+
+		iph->payload_len = htons(size + tcp_hdrlen(skb));
+	}
 	tcph = (struct tcphdr *)(hdr + skb_transport_offset(skb));
 	put_unaligned_be32(tso->tcp_seq, &tcph->seq);
-	tso->ip_id++;
 
 	if (!is_last) {
 		/* Clear all special flags for not last packet */
-- 
2.1.4

  reply	other threads:[~2015-10-25 20:03 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-25 19:58 [PATCH] net: tso: add support for IPv6 Emmanuel Grumbach
2015-10-25 20:02 ` Emmanuel Grumbach [this message]
     [not found]   ` <1445803371-19778-1-git-send-email-emmanuel.grumbach-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-10-26  4:03     ` [PATCH v2] " Toshiaki Makita
2015-10-26  7:47       ` Grumbach, Emmanuel
2015-10-26  8:13         ` Toshiaki Makita
     [not found]           ` <562DE0A4.80100-Zyj7fXuS5i5L9jVzuh4AOg@public.gmane.org>
2015-10-26  8:17             ` Toshiaki Makita
2015-10-26  8:17           ` Grumbach, Emmanuel
2015-10-25 22:34 ` [PATCH] " Sergei Shtylyov
2015-10-26  8:31 ` [PATCH v3] " Emmanuel Grumbach
2015-10-26 14:56   ` Eric Dumazet
2015-10-27  5:24   ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445803371-19778-1-git-send-email-emmanuel.grumbach@intel.com \
    --to=emmanuel.grumbach@intel.com \
    --cc=egrumbach@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).