diff options
| author |   Eric Dumazet <edumazet@google.com> | 2020-05-25 20:15:24 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-26 15:12:45 -0700 |
| commit | 239174945dac8cb9613db7755103d5fb6c32241d (patch) | |
| tree | 3eca0a15b66f6f2794aed1ee72861df924cb407b /net/ipv4 | |
| parent | Merge branch 'r8169-sync-hw-config-for-few-chip-versions-with-r8168-vendor-driver' (diff) | |
| download | linux-dev-239174945dac8cb9613db7755103d5fb6c32241d.tar.xz linux-dev-239174945dac8cb9613db7755103d5fb6c32241d.zip | |
tcp: tcp_v4_err() icmp skb is named icmp_skb
I missed the fact that tcp_v4_err() differs from tcp_v6_err().
After commit 4d1a2d9ec1c1 ("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: 45af29ca761c ("tcp: allow traceroute -Mtcp for unpriv users")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 900c6d154cbc..6789671f0f5a 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -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; |