]> git.baikalelectronics.ru Git - kernel.git/commitdiff
tcp: tcp_v4_err() icmp skb is named icmp_skb
authorEric Dumazet <edumazet@google.com>
Tue, 26 May 2020 03:15:24 +0000 (20:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 May 2020 22:12:45 +0000 (15:12 -0700)
I missed the fact that tcp_v4_err() differs from tcp_v6_err().

After commit e182eb83c960 ("Rename skb to icmp_skb in tcp_v4_err()")
the skb argument has been renamed to icmp_skb only in one function.

I will in a future patch reconciliate these functions to avoid
this kind of confusion.

Fixes: 1e209d95d612 ("tcp: allow traceroute -Mtcp for unpriv users")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_ipv4.c

index 900c6d154cbcf04fb09d71f1445d0723bcf3c409..6789671f0f5a02aa760e12d7b4282b620b4e928f 100644 (file)
@@ -573,7 +573,7 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
                if (fastopen && !fastopen->sk)
                        break;
 
-               ip_icmp_error(sk, skb, err, th->dest, info, (u8 *)th);
+               ip_icmp_error(sk, icmp_skb, err, th->dest, info, (u8 *)th);
 
                if (!sock_owned_by_user(sk)) {
                        sk->sk_err = err;