diff options
author | Damian Lukowski <damian@tvk.rwth-aachen.de> | 2009-08-25 20:16:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 05:45:38 -0400 |
commit | 4d1a2d9ec1c17df077ed09a0d135bccf5637a3b7 (patch) | |
tree | a318cb0240edeea4702655542ac82e3c59314d06 /net/ipv4 | |
parent | 6ee1652051f14d1c110f48a5b3ee037d63d0c2fa (diff) |
Revert Backoff [v3]: Rename skb to icmp_skb in tcp_v4_err()
This supplementary patch renames skb to icmp_skb in tcp_v4_err() in order to
disambiguate from another sk_buff variable, which will be introduced
in a separate patch.
Signed-off-by: Damian Lukowski <damian@tvk.rwth-aachen.de>
Acked-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 6d88219c5e22..6ca1bc8c3025 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -328,26 +328,26 @@ static void do_pmtu_discovery(struct sock *sk, struct iphdr *iph, u32 mtu) | |||
328 | * | 328 | * |
329 | */ | 329 | */ |
330 | 330 | ||
331 | void tcp_v4_err(struct sk_buff *skb, u32 info) | 331 | void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) |
332 | { | 332 | { |
333 | struct iphdr *iph = (struct iphdr *)skb->data; | 333 | struct iphdr *iph = (struct iphdr *)icmp_skb->data; |
334 | struct tcphdr *th = (struct tcphdr *)(skb->data + (iph->ihl << 2)); | 334 | struct tcphdr *th = (struct tcphdr *)(icmp_skb->data + (iph->ihl << 2)); |
335 | struct tcp_sock *tp; | 335 | struct tcp_sock *tp; |
336 | struct inet_sock *inet; | 336 | struct inet_sock *inet; |
337 | const int type = icmp_hdr(skb)->type; | 337 | const int type = icmp_hdr(icmp_skb)->type; |
338 | const int code = icmp_hdr(skb)->code; | 338 | const int code = icmp_hdr(icmp_skb)->code; |
339 | struct sock *sk; | 339 | struct sock *sk; |
340 | __u32 seq; | 340 | __u32 seq; |
341 | int err; | 341 | int err; |
342 | struct net *net = dev_net(skb->dev); | 342 | struct net *net = dev_net(icmp_skb->dev); |
343 | 343 | ||
344 | if (skb->len < (iph->ihl << 2) + 8) { | 344 | if (icmp_skb->len < (iph->ihl << 2) + 8) { |
345 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); | 345 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
346 | return; | 346 | return; |
347 | } | 347 | } |
348 | 348 | ||
349 | sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest, | 349 | sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest, |
350 | iph->saddr, th->source, inet_iif(skb)); | 350 | iph->saddr, th->source, inet_iif(icmp_skb)); |
351 | if (!sk) { | 351 | if (!sk) { |
352 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); | 352 | ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS); |
353 | return; | 353 | return; |