Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756342Ab0BBQMd (ORCPT ); Tue, 2 Feb 2010 11:12:33 -0500 Received: from mail-yw0-f198.google.com ([209.85.211.198]:52431 "EHLO mail-yw0-f198.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835Ab0BBQMb (ORCPT ); Tue, 2 Feb 2010 11:12:31 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type; b=RZPRYBmc9ekWofyF2ppWLbz4pBtJagV0Iooh7S8sNW+cKX/d0qcu3pCNgowMEN0JwC qPTz7qezEFa2KQxd3cnrjfBjq7X1XEhsW2KgNPdi2abRpOIkuxs65UOPWi9RXS7I+u53 z2Y7wSQDQ67cT9jmdEfoVu9SczIdCwdZ3Iguk= Message-ID: <4B684EEB.20504@gmail.com> Date: Tue, 02 Feb 2010 11:12:27 -0500 From: William Allen Simpson User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: Linux Kernel Developers , Linux Kernel Network Developers CC: Andrew Morton Subject: [PATCH 1/7] net: tcp_header_len_th and tcp_option_len_th References: <4B684DE7.3020601@gmail.com> In-Reply-To: <4B684DE7.3020601@gmail.com> Content-Type: multipart/mixed; boundary="------------030608040105010100080506" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1788 Lines: 56 This is a multi-part message in MIME format. --------------030608040105010100080506 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Redefine two TCP header functions to accept TCP header pointer. When subtracting, return signed int to allow error checking. These functions will be used in subsequent patches that implement additional features. Signed-off-by: William.Allen.Simpson@gmail.com --- include/linux/tcp.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) --------------030608040105010100080506 Content-Type: text/plain; x-mac-type="54455854"; x-mac-creator="0"; name="len_th+2a3+2.6.33-rc6.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="len_th+2a3+2.6.33-rc6.patch" diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 7fee8a4..d0133cf 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -223,6 +223,18 @@ static inline unsigned int tcp_optlen(const struct sk_buff *skb) return (tcp_hdr(skb)->doff - 5) * 4; } +/* Length of fixed header plus standard options. */ +static inline unsigned int tcp_header_len_th(const struct tcphdr *th) +{ + return th->doff * 4; +} + +/* Length of standard options only. This could be negative. */ +static inline int tcp_option_len_th(const struct tcphdr *th) +{ + return (int)(th->doff * 4) - sizeof(*th); +} + /* This defines a selective acknowledgement block. */ struct tcp_sack_block_wire { __be32 start_seq; -- 1.6.3.3 --------------030608040105010100080506-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/