diff options
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 29964c3d363c..5b3c70ff7a72 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -738,7 +738,7 @@ static void tcp_v6_init_req(struct request_sock *req, struct sock *sk, | |||
738 | ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL) | 738 | ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL) |
739 | ireq->ir_iif = inet6_iif(skb); | 739 | ireq->ir_iif = inet6_iif(skb); |
740 | 740 | ||
741 | if (!TCP_SKB_CB(skb)->when && | 741 | if (!TCP_SKB_CB(skb)->tcp_tw_isn && |
742 | (ipv6_opt_accepted(sk, skb) || np->rxopt.bits.rxinfo || | 742 | (ipv6_opt_accepted(sk, skb) || np->rxopt.bits.rxinfo || |
743 | np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim || | 743 | np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim || |
744 | np->rxopt.bits.rxohlim || np->repflow)) { | 744 | np->rxopt.bits.rxohlim || np->repflow)) { |
@@ -1412,7 +1412,7 @@ static int tcp_v6_rcv(struct sk_buff *skb) | |||
1412 | TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + | 1412 | TCP_SKB_CB(skb)->end_seq = (TCP_SKB_CB(skb)->seq + th->syn + th->fin + |
1413 | skb->len - th->doff*4); | 1413 | skb->len - th->doff*4); |
1414 | TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); | 1414 | TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); |
1415 | TCP_SKB_CB(skb)->when = 0; | 1415 | TCP_SKB_CB(skb)->tcp_tw_isn = 0; |
1416 | TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); | 1416 | TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); |
1417 | TCP_SKB_CB(skb)->sacked = 0; | 1417 | TCP_SKB_CB(skb)->sacked = 0; |
1418 | 1418 | ||