From patchwork Sun Oct 25 20:02:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grumbach, Emmanuel" X-Patchwork-Id: 535626 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6FB84141364 for ; Mon, 26 Oct 2015 07:03:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768AbbJYUDR (ORCPT ); Sun, 25 Oct 2015 16:03:17 -0400 Received: from mga03.intel.com ([134.134.136.65]:25317 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbbJYUDQ (ORCPT ); Sun, 25 Oct 2015 16:03:16 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 25 Oct 2015 13:02:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,197,1444719600"; d="scan'208";a="834709360" Received: from unknown (HELO egrumbacBOX.ger.corp.intel.com) ([10.255.211.114]) by orsmga002.jf.intel.com with ESMTP; 25 Oct 2015 13:02:53 -0700 From: Emmanuel Grumbach To: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org, egrumbach@gmail.com, Emmanuel Grumbach Subject: [PATCH v2] net: tso: add support for IPv6 Date: Sun, 25 Oct 2015 22:02:51 +0200 Message-Id: <1445803371-19778-1-git-send-email-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445803107-18513-1-git-send-email-emmanuel.grumbach@intel.com> References: <1445803107-18513-1-git-send-email-emmanuel.grumbach@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 */