diff options
| author | ronaxdevil <pratabidya.007@gmail.com> | 2020-06-06 12:16:58 +0530 |
|---|---|---|
| committer | lucasponez <lucasponez@outlook.com> | 2020-12-06 05:32:19 -0800 |
| commit | c9d101bffe7b6a10fddc18bc7a2d0dc0962ed71f (patch) | |
| tree | cc92c8d9bbff0f97a4036908f210b2adb2adaf1a /net/ipv6/tcp_ipv6.c | |
| parent | 13ba6318ccffd7e3167f514ac34358ab74ff6b6c (diff) | |
Merge tag 'v3.18.140' of https://source.codeaurora.org/quic/la/kernel/msm-3.18 into android-10-release-qpk30.54r11.0
This is the 3.18.140 stable release
gpg: Signature made Thu 16 May 2019 12:47:33 PM IST
gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
Signed-off-by: ronaxdevil <pratabidya.007@gmail.com>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d79d0524e1c5..292c3726576f 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1100,11 +1100,11 @@ static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, newnp->ipv6_fl_list = NULL; newnp->pktoptions = NULL; newnp->opt = NULL; - newnp->mcast_oif = tcp_v6_iif(skb); - newnp->mcast_hops = ipv6_hdr(skb)->hop_limit; - newnp->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(skb)); + newnp->mcast_oif = inet_iif(skb); + newnp->mcast_hops = ip_hdr(skb)->ttl; + newnp->rcv_flowinfo = 0; if (np->repflow) - newnp->flow_label = ip6_flowlabel(ipv6_hdr(skb)); + newnp->flow_label = 0; /* * No need to charge this sock to the relevant IPv6 refcnt debug socks count |