drm: merge Linux master into HEAD

[karo-tx-linux.git] / net / netfilter / nf_tproxy_core.c

diff --git a/net/netfilter/nf_tproxy_core.c b/net/netfilter/nf_tproxy_core.c
index cdc97f3105a3153e4c55cfb57f5eb4994d393922..5490fc37c92dfa5363a2992fd67fd4f145f65360 100644 (file)
--- a/net/netfilter/nf_tproxy_core.c
+++ b/net/netfilter/nf_tproxy_core.c
@@ -71,6 +71,7 @@ int
 nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)
 {
        if (inet_sk(sk)->transparent) {
+               skb_orphan(skb);
                skb->sk = sk;
                skb->destructor = nf_tproxy_destructor;
                return 1;