From patchwork Thu Feb 4 15:35:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Gallek X-Patchwork-Id: 579002 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 B6A5214056B for ; Fri, 5 Feb 2016 02:35:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933144AbcBDPfa (ORCPT ); Thu, 4 Feb 2016 10:35:30 -0500 Received: from mail-qg0-f54.google.com ([209.85.192.54]:33497 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753943AbcBDPfZ (ORCPT ); Thu, 4 Feb 2016 10:35:25 -0500 Received: by mail-qg0-f54.google.com with SMTP id b35so44190400qge.0 for ; Thu, 04 Feb 2016 07:35:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jJd0kBDLpJNwbWhNtRsiqcxK/E5tzZQCoXh+pKJ7arA=; b=NXUVVl50w+eg5M0/FeSgOaHvlYDmxqM/Mf+0Bym4QpA1LlzX9WcK4kNj8AA6PYwbkQ vlKoA4jstbpyam4i9fIx/w/sq10oJ8NXcPN6Q7O7SX+m6XK0bL7o7hIDafQP8ZCmo4su eOud/vbPQbMrVSlXQZ3FsSdcfYHzzlZxaUWmeEWx/sE3DTt+8YqR9InHNVsVOwGPhhAR /Og5fnK/aRyDYNEsjjedKtoJMb4Vdkp71qX3Scg4T1We5YRRBcbYT7oS/bSTEbkjT1k+ leCGpQu5+k95OAFuLjdAPcjQJF+5m2Qk8ZSAGD/2RC1OlzXCx0nl1Su4cJG6ftL9qON0 XBhQ== X-Gm-Message-State: AG10YOSGfKVxbZeHlNiwwJNkdBawaS4Gsx8I44U/Xv+cJ8jm5SjTZNv6OvsydVzMXvhPd50V X-Received: by 10.140.195.203 with SMTP id q194mr10359377qha.45.1454600125037; Thu, 04 Feb 2016 07:35:25 -0800 (PST) Received: from cgallek-warp18.nyc.corp.google.com ([172.29.18.56]) by smtp.gmail.com with ESMTPSA id f3sm5354879qge.44.2016.02.04.07.35.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Feb 2016 07:35:23 -0800 (PST) From: Craig Gallek To: netdev@vger.kernel.org, David Miller Subject: [PATCH net-next 3/7] tcp: __tcp_hdrlen() helper Date: Thu, 4 Feb 2016 10:35:14 -0500 Message-Id: <1454600118-30152-4-git-send-email-kraigatgoog@gmail.com> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1454600118-30152-1-git-send-email-kraigatgoog@gmail.com> References: <1454600118-30152-1-git-send-email-kraigatgoog@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Craig Gallek tcp_hdrlen is wasteful if you already have a pointer to struct tcphdr. This splits the size calculation into a helper function that can be used if a struct tcphdr is already available. Signed-off-by: Craig Gallek Acked-by: Eric Dumazet --- include/linux/tcp.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index b386361ba3e8..c216707d63bf 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -29,9 +29,14 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb) return (struct tcphdr *)skb_transport_header(skb); } +static inline unsigned int __tcp_hdrlen(const struct tcphdr *th) +{ + return th->doff * 4; +} + static inline unsigned int tcp_hdrlen(const struct sk_buff *skb) { - return tcp_hdr(skb)->doff * 4; + return __tcp_hdrlen(tcp_hdr(skb)); } static inline struct tcphdr *inner_tcp_hdr(const struct sk_buff *skb)