diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
| commit | e3db1289e7432a882823a7effc474aff78868489 (patch) | |
| tree | 79188812b29602fe3b3641d55c32cfdc2101f0ef /net/ipv6/tcp_ipv6.c | |
| parent | c316cf670491def52a396d3bdc5a63ad01f7fefa (diff) | |
| parent | 05e97a9eda72d58dba293857df6aac62584ef99a (diff) | |
Merge MTD fixes into -next
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 7a8237acd210..4f4310a36a04 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1062,6 +1062,7 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * | |||
| 1062 | newtp->af_specific = &tcp_sock_ipv6_mapped_specific; | 1062 | newtp->af_specific = &tcp_sock_ipv6_mapped_specific; |
| 1063 | #endif | 1063 | #endif |
| 1064 | 1064 | ||
| 1065 | newnp->ipv6_mc_list = NULL; | ||
| 1065 | newnp->ipv6_ac_list = NULL; | 1066 | newnp->ipv6_ac_list = NULL; |
| 1066 | newnp->ipv6_fl_list = NULL; | 1067 | newnp->ipv6_fl_list = NULL; |
| 1067 | newnp->pktoptions = NULL; | 1068 | newnp->pktoptions = NULL; |
| @@ -1131,6 +1132,7 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * | |||
| 1131 | First: no IPv4 options. | 1132 | First: no IPv4 options. |
| 1132 | */ | 1133 | */ |
| 1133 | newinet->inet_opt = NULL; | 1134 | newinet->inet_opt = NULL; |
| 1135 | newnp->ipv6_mc_list = NULL; | ||
| 1134 | newnp->ipv6_ac_list = NULL; | 1136 | newnp->ipv6_ac_list = NULL; |
| 1135 | newnp->ipv6_fl_list = NULL; | 1137 | newnp->ipv6_fl_list = NULL; |
| 1136 | 1138 | ||