From 63a1a412713485e6dd725e40a326f647f22ed787 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Thu, 10 Apr 2008 20:53:10 -0700 Subject: [PATCH] --- yaml --- r: 88273 b: refs/heads/master c: 7951f0b03a63d657c72c7d54d306ef3357e7e604 h: refs/heads/master i: 88271: a76dac119da365790b24f56c1abdcccd7847d065 v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_timewait_sock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 664eee8a39dd..c63b4ddfe52a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 951e07c930f5f66b676eaa4c32a1b0d8e2d7d06a +refs/heads/master: 7951f0b03a63d657c72c7d54d306ef3357e7e604 diff --git a/trunk/net/ipv4/inet_timewait_sock.c b/trunk/net/ipv4/inet_timewait_sock.c index 876169f3a528..717c411a5c6b 100644 --- a/trunk/net/ipv4/inet_timewait_sock.c +++ b/trunk/net/ipv4/inet_timewait_sock.c @@ -124,6 +124,7 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk, const int stat tw->tw_hash = sk->sk_hash; tw->tw_ipv6only = 0; tw->tw_prot = sk->sk_prot_creator; + tw->tw_net = sk->sk_net; atomic_set(&tw->tw_refcnt, 1); inet_twsk_dead_node_init(tw); __module_get(tw->tw_prot->owner);