Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753157Ab0AWFcb (ORCPT ); Sat, 23 Jan 2010 00:32:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751746Ab0AWFca (ORCPT ); Sat, 23 Jan 2010 00:32:30 -0500 Received: from mail-iw0-f186.google.com ([209.85.223.186]:59292 "EHLO mail-iw0-f186.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563Ab0AWFc3 (ORCPT ); Sat, 23 Jan 2010 00:32:29 -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=Ry0kAO1QJbly7EmCWVCoyEZ/D3nOcosG19XCsHPm3383eitZgAlQSWZDg6fBTu0gVG QtCXlfh9oBlK/4xfOp48nD5sQbomerFheI1grzaBsFJUVG1Y547U4dfndH6UkXq3y0jU xsIsrFJLlb8aXlrbFLu+6zw9TV7uyZbpv9E04= Message-ID: <4B5A89E9.90209@gmail.com> Date: Sat, 23 Jan 2010 00:32:25 -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: <4B5A88C4.7050205@gmail.com> In-Reply-To: <4B5A88C4.7050205@gmail.com> Content-Type: multipart/mixed; boundary="------------090000080502010508000600" 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. --------------090000080502010508000600 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(-) --------------090000080502010508000600 Content-Type: text/plain; x-mac-type="54455854"; x-mac-creator="0"; name="len_th+2a3+2.6.33-rc5.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="len_th+2a3+2.6.33-rc5.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 --------------090000080502010508000600-- -- 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/