From 4babbd47b9e00b6d857a2aea574f2819ad156f86 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Sun, 3 Feb 2008 04:08:26 -0800 Subject: [PATCH] --- yaml --- r: 82698 b: refs/heads/master c: ad8bb78083ff58f5dff3ef8cf8ac3e0336f8ae36 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/inet_timewait_sock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59aef3b058ec..27045c7c213a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf6b5fbe7426cab3322c3a82f25291672d70a65f +refs/heads/master: ad8bb78083ff58f5dff3ef8cf8ac3e0336f8ae36 diff --git a/trunk/include/net/inet_timewait_sock.h b/trunk/include/net/inet_timewait_sock.h index 67e925065aae..296547bfb0b7 100644 --- a/trunk/include/net/inet_timewait_sock.h +++ b/trunk/include/net/inet_timewait_sock.h @@ -116,6 +116,7 @@ struct inet_timewait_sock { #define tw_hash __tw_common.skc_hash #define tw_prot __tw_common.skc_prot #define tw_net __tw_common.skc_net + int tw_timeout; volatile unsigned char tw_substate; /* 3 bits hole, try to pack */ unsigned char tw_rcv_wscale; @@ -130,7 +131,6 @@ struct inet_timewait_sock { __u8 tw_ipv6only:1; /* 15 bits hole, try to pack */ __u16 tw_ipv6_offset; - int tw_timeout; unsigned long tw_ttd; struct inet_bind_bucket *tw_tb; struct hlist_node tw_death_node;