From 4f6ad5763a8159c51fbebfe39f85a7d66ef23cce Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Sun, 25 Sep 2011 02:21:30 +0000 Subject: [PATCH] --- yaml --- r: 264255 b: refs/heads/master c: 676a1184e8afd4fed7948232df1ff91517400859 h: refs/heads/master i: 264253: acc294e331b830036020e612d6861d5a6bb98381 264251: e7708445cdc69442f796c06b97b21ccfb790f671 264247: c588d253518f8de907f50a4bfbf6bb0acdeabb15 264239: 748ca02f788897c826eb713e57f93d6ff2186d53 264223: edbdc5a43a3e7c5d93e96ef0d13c7b791dc076c5 264191: b06abeac2fa90f9f53360782482ff97009c3ba8d v: v3 --- [refs] | 2 +- trunk/net/ipv6/tcp_ipv6.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 357b64b55d0d..cba2fbfcaba2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6482aa7c120447858da1869197b48eff66435a31 +refs/heads/master: 676a1184e8afd4fed7948232df1ff91517400859 diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c index 3c9fa618b69d..79cc6469508d 100644 --- a/trunk/net/ipv6/tcp_ipv6.c +++ b/trunk/net/ipv6/tcp_ipv6.c @@ -1383,6 +1383,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, newtp->af_specific = &tcp_sock_ipv6_mapped_specific; #endif + newnp->ipv6_ac_list = NULL; + newnp->ipv6_fl_list = NULL; newnp->pktoptions = NULL; newnp->opt = NULL; newnp->mcast_oif = inet6_iif(skb); @@ -1447,6 +1449,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, First: no IPv4 options. */ newinet->inet_opt = NULL; + newnp->ipv6_ac_list = NULL; newnp->ipv6_fl_list = NULL; /* Clone RX bits */