From 769d1e3d300dbb91a8ee682025ea534751ca5f88 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Fri, 21 Mar 2008 04:12:54 -0700 Subject: [PATCH] --- yaml --- r: 90191 b: refs/heads/master c: 8d9f1744cab50acb0c6c9553be533621e01f178b h: refs/heads/master i: 90189: a778924d2f0b82f9f72494648eb4c03ec76b3326 90187: 44d4cbbf050ff4567424a044cfbf28bc7fb66e72 90183: 0a7fc95522e2fa929cd6ff002ca98412cecbf714 90175: d4d0d48ba39bda3e03fd47ec575f325623fa5382 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 e4662461a1b4..76f5d2be7fa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a91275eff43a527e1a25d6d034cbcd19ee323e64 +refs/heads/master: 8d9f1744cab50acb0c6c9553be533621e01f178b 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);