Re: [net-next:master 90/102] net/ipv4/route.c:1283:9: warning: unused variable 'saddr'
From: Fengguang Wu <hidden>
Date: 2012-07-12 14:54:49
Also in:
kernel-janitors
OK! On Thu, Jul 12, 2012 at 07:40:58AM -0700, David Miller wrote:
quoted hunk ↗ jump to hunk
There's not need to report these to kernel-janitors if it's a net-next specific issue and I'm going to fix it up 5 minutes after you report it. ==================== [PATCH] ipv4: Fix warnings in ip_do_redirect() for some configurations. Reported-by: Fengguang Wu <redacted> Signed-off-by: David S. Miller <davem@davemloft.net> --- net/ipv4/route.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 23bbe29..9319bf1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c@@ -1275,12 +1275,9 @@ static void rt_del(unsigned int hash, struct rtable *rt) static void ip_do_redirect(struct dst_entry *dst, struct sk_buff *skb) { - const struct iphdr *iph = (const struct iphdr *) skb->data; __be32 new_gw = icmp_hdr(skb)->un.gateway; __be32 old_gw = ip_hdr(skb)->saddr; struct net_device *dev = skb->dev; - __be32 daddr = iph->daddr; - __be32 saddr = iph->saddr; struct in_device *in_dev; struct neighbour *n; struct rtable *rt;@@ -1336,11 +1333,16 @@ static void ip_do_redirect(struct dst_entry *dst, struct sk_buff *skb) reject_redirect: #ifdef CONFIG_IP_ROUTE_VERBOSE - if (IN_DEV_LOG_MARTIANS(in_dev)) + if (IN_DEV_LOG_MARTIANS(in_dev)) { + const struct iphdr *iph = (const struct iphdr *) skb->data; + __be32 daddr = iph->daddr; + __be32 saddr = iph->saddr; + net_info_ratelimited("Redirect from %pI4 on %s about %pI4 ignored\n" " Advised path = %pI4 -> %pI4\n", &old_gw, dev->name, &new_gw, &saddr, &daddr); + } #endif ; }-- 1.7.10.4