diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /include/net/inet_timewait_sock.h | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/net/inet_timewait_sock.h')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index 3b070352e869..4ade56ef3a4d 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h @@ -112,6 +112,7 @@ struct inet_timewait_sock { #define tw_node __tw_common.skc_node #define tw_bind_node __tw_common.skc_bind_node #define tw_refcnt __tw_common.skc_refcnt +#define tw_hash __tw_common.skc_hash #define tw_prot __tw_common.skc_prot volatile unsigned char tw_substate; /* 3 bits hole, try to pack */ @@ -126,7 +127,6 @@ struct inet_timewait_sock { /* And these are ours. */ __u8 tw_ipv6only:1; /* 31 bits hole, try to pack */ - int tw_hashent; int tw_timeout; unsigned long tw_ttd; struct inet_bind_bucket *tw_tb; |