From b20b77c33eef24dad81d55383b21fe69e4640896 Mon Sep 17 00:00:00 2001 From: Vegard Nossum Date: Fri, 12 Sep 2008 16:17:43 -0700 Subject: [PATCH] --- yaml --- r: 111659 b: refs/heads/master c: 78d15e82754945ee9821fb491b57faf43abfb9d7 h: refs/heads/master i: 111657: 33d700ba81c4f73d1b23331226340fbfef7f86ed 111655: 900a4441cff2603d9b79c0bac41bad18f22d583b v: v3 --- [refs] | 2 +- trunk/net/ipv6/tcp_ipv6.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b15012d49ca6..d6dac441bad6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f262b59becc3f557da6460232abac13706402849 +refs/heads/master: 78d15e82754945ee9821fb491b57faf43abfb9d7 diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c index b585c850a89a..e85f377a8f82 100644 --- a/trunk/net/ipv6/tcp_ipv6.c +++ b/trunk/net/ipv6/tcp_ipv6.c @@ -1286,7 +1286,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, struct request_sock *req, struct dst_entry *dst) { - struct inet6_request_sock *treq = inet6_rsk(req); + struct inet6_request_sock *treq; struct ipv6_pinfo *newnp, *np = inet6_sk(sk); struct tcp6_sock *newtcp6sk; struct inet_sock *newinet; @@ -1350,6 +1350,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, return newsk; } + treq = inet6_rsk(req); opt = np->opt; if (sk_acceptq_is_full(sk))