iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: rename tcp_v4_err() skb parameter

Browse Source 
This essentially reverts 4d1a2d9ec1 ("Revert Backoff [v3]:
Rename skb to icmp_skb in tcp_v4_err()")

Now we have tcp_ld_RTO_revert() helper, we can use the usual
name for sk_buff parameter, so that tcp_v4_err() and
tcp_v6_err() use similar names.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2020-05-26 19:48:50 -07:00 committed by David S. Miller
parent f745664257
commit a12daf13a4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/ipv4/tcp_ipv4.c
View File

@ -458,23 +458,23 @@ static void tcp_ld_RTO_revert(struct sock *sk, u32 seq)
* *
*/ */
int tcp_v4_err(struct sk_buff *icmp_skb, u32 info) int tcp_v4_err(struct sk_buff *skb, u32 info)
{ {
const struct iphdr *iph = (const struct iphdr *)icmp_skb->data; const struct iphdr *iph = (const struct iphdr *)skb->data;
struct tcphdr *th = (struct tcphdr *)(icmp_skb->data + (iph->ihl << 2)); struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2));
struct tcp_sock *tp; struct tcp_sock *tp;
struct inet_sock *inet; struct inet_sock *inet;
const int type = icmp_hdr(icmp_skb)->type; const int type = icmp_hdr(skb)->type;
const int code = icmp_hdr(icmp_skb)->code; const int code = icmp_hdr(skb)->code;
struct sock *sk; struct sock *sk;
struct request_sock *fastopen; struct request_sock *fastopen;
u32 seq, snd_una; u32 seq, snd_una;
int err; int err;
struct net *net = dev_net(icmp_skb->dev); struct net *net = dev_net(skb->dev);
sk = __inet_lookup_established(net, &tcp_hashinfo, iph->daddr, sk = __inet_lookup_established(net, &tcp_hashinfo, iph->daddr,
th->dest, iph->saddr, ntohs(th->source), th->dest, iph->saddr, ntohs(th->source),
inet_iif(icmp_skb), 0); inet_iif(skb), 0);
if (!sk) { if (!sk) {
__ICMP_INC_STATS(net, ICMP_MIB_INERRORS); __ICMP_INC_STATS(net, ICMP_MIB_INERRORS);
return -ENOENT; return -ENOENT;
@ -524,7 +524,7 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
switch (type) { switch (type) {
case ICMP_REDIRECT: case ICMP_REDIRECT:
if (!sock_owned_by_user(sk)) if (!sock_owned_by_user(sk))
do_redirect(icmp_skb, sk); do_redirect(skb, sk);
goto out; goto out;
case ICMP_SOURCE_QUENCH: case ICMP_SOURCE_QUENCH:
/* Just silently ignore these. */ /* Just silently ignore these. */
@ -578,7 +578,7 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
if (fastopen && !fastopen->sk) if (fastopen && !fastopen->sk)
break; break;
ip_icmp_error(sk, icmp_skb, err, th->dest, info, (u8 *)th); ip_icmp_error(sk, skb, err, th->dest, info, (u8 *)th);
if (!sock_owned_by_user(sk)) { if (!sock_owned_by_user(sk)) {
sk->sk_err = err; sk->sk_err = err;