---

yaml --- r: 211094 b: refs/heads/master c: d485d50 h: refs/heads/master v: v3
git-mirror · Sep 22, 2010 · 51abd1e · 51abd1e
1 parent a5fa5cd
commit 51abd1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d13008e7345fa7a79d8f6438150dc15d6ba6e9d
+refs/heads/master: d485d500cf6b13a33bc7a6c09091deea7ea603ca
diff --git a/trunk/net/netfilter/nf_tproxy_core.c b/trunk/net/netfilter/nf_tproxy_core.c
@@ -70,7 +70,11 @@ nf_tproxy_destructor(struct sk_buff *skb)
 int
 nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)
 {
-	if (inet_sk(sk)->transparent) {
+	bool transparent = (sk->sk_state == TCP_TIME_WAIT) ?
+				inet_twsk(sk)->tw_transparent :
+				inet_sk(sk)->transparent;
+
+	if (transparent) {
 		skb_orphan(skb);
 		skb->sk = sk;
 		skb->destructor = nf_tproxy_destructor;