From patchwork Wed Feb 10 00:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Gallek X-Patchwork-Id: 581240 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 C4BCD140B9A for ; Wed, 10 Feb 2016 11:20:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755686AbcBJATW (ORCPT ); Tue, 9 Feb 2016 19:19:22 -0500 Received: from mail-qg0-f54.google.com ([209.85.192.54]:33753 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754046AbcBJATN (ORCPT ); Tue, 9 Feb 2016 19:19:13 -0500 Received: by mail-qg0-f54.google.com with SMTP id b35so3078146qge.0 for ; Tue, 09 Feb 2016 16:19:12 -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=L7zZ7QGweQlMcCHrr9E3tOFYntm9d03HkMNQGI5U+hdiaAVyWnuWt5Dt7ubtlCbzdm qm8rpzwLpZqPuPcUWJMn6XBBu9Mz8PNZvVkbwFRIz4jgOB7L0gD1YO3sKWeJoPAhhkg5 5OzPZhLZAwbW+fBaKGSl6L0OBVHO+DZ9r/Fzh0OqJN1WxeIlAO+KVkIZG9YPvYAGjZUo Pu9pitGUOR1Ii+IRqD4jouK8YkZyFBrWBXNSO9UV0n40BNQqK++3aX8HHGT37RaaDpOY eNpkC9eEINeS1dT7SVazSBVUYmt6y/Mz0oHVbs02L1xhSUr9kDMH2ErafkJPyuCggUjw RGJA== X-Gm-Message-State: AG10YOQS4G/EKBVYUMyrQmIgiA8E1KBHDMTez2N1+i/FLhQhpLpW+N6pJHYw2vaNOHtbTTJj X-Received: by 10.140.202.212 with SMTP id x203mr41674155qha.19.1455063552589; Tue, 09 Feb 2016 16:19:12 -0800 (PST) Received: from cgallek-warp18.nyc.corp.google.com ([172.29.18.56]) by smtp.gmail.com with ESMTPSA id i136sm219319qhc.42.2016.02.09.16.19.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Feb 2016 16:19:11 -0800 (PST) From: Craig Gallek To: netdev@vger.kernel.org, David Miller Subject: [PATCH net-next v3 3/7] tcp: __tcp_hdrlen() helper Date: Tue, 9 Feb 2016 19:18:58 -0500 Message-Id: <1455063542-18227-4-git-send-email-kraigatgoog@gmail.com> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1455063542-18227-1-git-send-email-kraigatgoog@gmail.com> References: <1455063542-18227-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 --- 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)