aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index de51a88bec6f..9400b4326f22 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -742,7 +742,8 @@ static void tcp_v6_init_req(struct request_sock *req, struct sock *sk,
742 ireq->ir_iif = inet6_iif(skb); 742 ireq->ir_iif = inet6_iif(skb);
743 743
744 if (!TCP_SKB_CB(skb)->tcp_tw_isn && 744 if (!TCP_SKB_CB(skb)->tcp_tw_isn &&
745 (ipv6_opt_accepted(sk, skb) || np->rxopt.bits.rxinfo || 745 (ipv6_opt_accepted(sk, skb, &TCP_SKB_CB(skb)->header.h6) ||
746 np->rxopt.bits.rxinfo ||
746 np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim || 747 np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim ||
747 np->rxopt.bits.rxohlim || np->repflow)) { 748 np->rxopt.bits.rxohlim || np->repflow)) {
748 atomic_inc(&skb->users); 749 atomic_inc(&skb->users);
@@ -1367,7 +1368,7 @@ ipv6_pktoptions:
1367 np->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb)); 1368 np->rcv_flowinfo = ip6_flowinfo(ipv6_hdr(opt_skb));
1368 if (np->repflow) 1369 if (np->repflow)
1369 np->flow_label = ip6_flowlabel(ipv6_hdr(opt_skb)); 1370 np->flow_label = ip6_flowlabel(ipv6_hdr(opt_skb));
1370 if (ipv6_opt_accepted(sk, opt_skb)) { 1371 if (ipv6_opt_accepted(sk, opt_skb, &TCP_SKB_CB(opt_skb)->header.h6)) {
1371 skb_set_owner_r(opt_skb, sk); 1372 skb_set_owner_r(opt_skb, sk);
1372 opt_skb = xchg(&np->pktoptions, opt_skb); 1373 opt_skb = xchg(&np->pktoptions, opt_skb);
1373 } else { 1374 } else {