aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/tcp.h
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-08-09 23:09:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:42:13 -0400
commit8feaf0c0a5488b3d898a9c207eb6678f44ba3f26 (patch)
treeddd004afe2f7c8295f6fdb94d34f78a42b5961cb /include/linux/tcp.h
parent33b62231908c58ae04185e4f1063d1e35a7c8576 (diff)
[INET]: Generalise tcp_tw_bucket, aka TIME_WAIT sockets
This paves the way to generalise the rest of the sock ID lookup routines and saves some bytes in TCPv4 TIME_WAIT sockets on distro kernels (where IPv6 is always built as a module): [root@qemu ~]# grep tw_sock /proc/slabinfo tw_sock_TCPv6 0 0 128 31 1 tw_sock_TCP 0 0 96 41 1 [root@qemu ~]# Now if a protocol wants to use the TIME_WAIT generic infrastructure it only has to set the sk_prot->twsk_obj_size field with the size of its inet_timewait_sock derived sock and proto_register will create sk_prot->twsk_slab, for now its only for INET sockets, but we can introduce timewait_sock later if some non INET transport protocolo wants to use this stuff. Next changesets will take advantage of this new infrastructure to generalise even more TCP code. [acme@toy net-2.6.14]$ grep built-in /tmp/before.size /tmp/after.size /tmp/before.size: 188646 11764 5068 205478 322a6 net/ipv4/built-in.o /tmp/after.size: 188144 11764 5068 204976 320b0 net/ipv4/built-in.o [acme@toy net-2.6.14]$ Tested with both IPv4 & IPv6 (::1 (localhost) & ::ffff:172.20.0.1 (qemu host)). Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/tcp.h')
-rw-r--r--include/linux/tcp.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index b88fe05fdcbf..5d295b1b3de7 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -179,6 +179,7 @@ struct tcp_info
179#include <linux/skbuff.h> 179#include <linux/skbuff.h>
180#include <linux/ip.h> 180#include <linux/ip.h>
181#include <net/sock.h> 181#include <net/sock.h>
182#include <net/inet_timewait_sock.h>
182 183
183/* This defines a selective acknowledgement block. */ 184/* This defines a selective acknowledgement block. */
184struct tcp_sack_block { 185struct tcp_sack_block {
@@ -387,6 +388,20 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
387 return (struct tcp_sock *)sk; 388 return (struct tcp_sock *)sk;
388} 389}
389 390
391struct tcp_timewait_sock {
392 struct inet_timewait_sock tw_sk;
393 __u32 tw_rcv_nxt;
394 __u32 tw_snd_nxt;
395 __u32 tw_rcv_wnd;
396 __u32 tw_ts_recent;
397 long tw_ts_recent_stamp;
398};
399
400static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
401{
402 return (struct tcp_timewait_sock *)sk;
403}
404
390static inline void *tcp_ca(const struct tcp_sock *tp) 405static inline void *tcp_ca(const struct tcp_sock *tp)
391{ 406{
392 return (void *) tp->ca_priv; 407 return (void *) tp->ca_priv;