diff options
| author |   Julian Anastasov <ja@ssi.bg> | 2017-02-06 23:14:14 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-07 13:07:46 -0500 |
| commit | c3a2e8370534f810cac6050169db0ed3e0f94f0b (patch) | |
| tree | e7d955ab2ffde6bb88cf6b3c69ea41a4841e6d9f /net/ipv4/tcp_output.c | |
| parent | sctp: add dst_pending_confirm flag (diff) | |
| download | linux-dev-c3a2e8370534f810cac6050169db0ed3e0f94f0b.tar.xz linux-dev-c3a2e8370534f810cac6050169db0ed3e0f94f0b.zip | |
tcp: replace dst_confirm with sk_dst_confirm
When same struct dst_entry can be used for many different
neighbours we can not use it for pending confirmations.
Use the new sk_dst_confirm() helper to propagate the
indication from received packets to sock_confirm_neigh().
Reported-by: YueHaibing <yuehaibing@huawei.com>
Fixes: 5110effee8fd ("net: Do delayed neigh confirmation.")
Fixes: f2bb4bedf35d ("ipv4: Cache output routes in fib_info nexthops.")
Tested-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index ccf1ef4dcba4..61f272a99a49 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -980,6 +980,8 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, skb_set_hash_from_sk(skb, sk); atomic_add(skb->truesize, &sk->sk_wmem_alloc); + skb_set_dst_pending_confirm(skb, sk->sk_dst_pending_confirm); + /* Build TCP header and checksum it. */ th = (struct tcphdr *)skb->data; th->source = inet->inet_sport; |