From 1b577c266141062a86ed6216a16bf33cabf40b58 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 28 Nov 2006 00:48:32 -0200 Subject: [PATCH] --- yaml --- r: 41899 b: refs/heads/master c: 2ff52f282cf287d60e9eda1f3b5ec83e00a86130 h: refs/heads/master i: 41897: def97905a661326b69697108aba815988e567fc6 41895: 6e6e261d8f8a6d6b88cc099299625f489f3ade5f v: v3 --- [refs] | 2 +- trunk/include/linux/tcp.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b48a15e1919f..1dce04a39c81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d0dbc4a9b2d325458dcbf9a8329bd1d2cc7bd7e +refs/heads/master: 2ff52f282cf287d60e9eda1f3b5ec83e00a86130 diff --git a/trunk/include/linux/tcp.h b/trunk/include/linux/tcp.h index dd61b172ac68..b42ff0efc2df 100644 --- a/trunk/include/linux/tcp.h +++ b/trunk/include/linux/tcp.h @@ -227,7 +227,8 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req) struct tcp_sock { /* inet_connection_sock has to be the first member of tcp_sock */ struct inet_connection_sock inet_conn; - int tcp_header_len; /* Bytes of tcp header to send */ + u16 tcp_header_len; /* Bytes of tcp header to send */ + u16 xmit_size_goal; /* Goal for segmenting output packets */ /* * Header prediction flags @@ -268,8 +269,6 @@ struct tcp_sock { __u32 snd_wnd; /* The window we expect to receive */ __u32 max_window; /* Maximal window ever seen from peer */ __u32 mss_cache; /* Cached effective mss, not including SACKS */ - __u16 xmit_size_goal; /* Goal for segmenting output packets */ - /* XXX Two bytes hole, try to pack */ __u32 window_clamp; /* Maximal window to advertise */ __u32 rcv_ssthresh; /* Current window clamp */