Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 77d723bbe050..eec814fe53b8 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1119,11 +1119,11 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff *
                 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