Commit f86502bf authored by David S. Miller's avatar David S. Miller
Browse files

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



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: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d741653
...@@ -730,7 +730,6 @@ out_err: ...@@ -730,7 +730,6 @@ out_err:
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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment