Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / include / net / inet_timewait_sock.h

diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index fc19376986259de8faf9c2be4c5c3376780e54ff..c9b3eb70f340d48ffe60105622bee367c7ea848f 100644 (file)
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -70,6 +70,7 @@ struct inet_timewait_sock {
 #define tw_dport               __tw_common.skc_dport
 #define tw_num                 __tw_common.skc_num
 #define tw_cookie              __tw_common.skc_cookie
+#define tw_dr                  __tw_common.skc_tw_dr
 
        int                     tw_timeout;
        volatile unsigned char  tw_substate;
@@ -88,7 +89,6 @@ struct inet_timewait_sock {
        kmemcheck_bitfield_end(flags);
        struct timer_list       tw_timer;
        struct inet_bind_bucket *tw_tb;
-       struct inet_timewait_death_row *tw_dr;
 };
 #define tw_tclass tw_tos