android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IPV4] icmp: Kill local 'ip' arg in icmp_redirect().

Browse Source 
It is typed wrong, and it's only assigned and used once.
So just pass in iph->daddr directly which fixes both problems.

Based upon a patch by Alexey Dobriyan.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-06-05 21:19:24 -07:00
parent 6d74165350
commit f86502bfc1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/icmp.c
View File

@ -730,7 +730,6 @@ static void icmp_unreach(struct sk_buff *skb)
static void icmp_redirect(struct sk_buff *skb) static void icmp_redirect(struct sk_buff *skb)
{ {
struct iphdr *iph; struct iphdr *iph;
unsigned long ip;
if (skb->len < sizeof(struct iphdr)) if (skb->len < sizeof(struct iphdr))
goto out_err; goto out_err;
@ -742,7 +741,6 @@ static void icmp_redirect(struct sk_buff *skb)
goto out; goto out;
iph = (struct iphdr *)skb->data; iph = (struct iphdr *)skb->data;
ip = iph->daddr;
switch (skb->h.icmph->code & 7) { switch (skb->h.icmph->code & 7) {
case ICMP_REDIR_NET: case ICMP_REDIR_NET:
@ -752,7 +750,8 @@ static void icmp_redirect(struct sk_buff *skb)
*/ */
case ICMP_REDIR_HOST: case ICMP_REDIR_HOST:
case ICMP_REDIR_HOSTTOS: case ICMP_REDIR_HOSTTOS:
ip_rt_redirect(skb->nh.iph->saddr, ip, skb->h.icmph->un.gateway, ip_rt_redirect(skb->nh.iph->saddr, iph->daddr,
skb->h.icmph->un.gateway,
iph->saddr, skb->dev); iph->saddr, skb->dev);
break; break;
} }