diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-12 07:40:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-12 07:40:05 -0700 |
| commit | 99ee038d41ebbb442921b6d388d08e907b037dac (patch) | |
| tree | 17b9371ccb0f561dafd356819e7dc41ea95b9b30 /net/ipv4/route.c | |
| parent | 3ec5a261aef55a32664bffd335e5c32aeadf3215 (diff) | |
| download | op-kernel-dev-99ee038d41ebbb442921b6d388d08e907b037dac.zip op-kernel-dev-99ee038d41ebbb442921b6d388d08e907b037dac.tar.gz | |
ipv4: Fix warnings in ip_do_redirect() for some configurations.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 10 |
1 files 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 ; } |
