From c28f55a5828e8ed9af47cebac0f374c21b162c93 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 13 May 2011 18:01:21 -0400 Subject: [PATCH] --- yaml --- r: 247485 b: refs/heads/master c: c5be24ff62d238a3fdd5d15461b420cd72e78a14 h: refs/heads/master i: 247483: ced9bc82a766c89452fb3cda90967f1736903655 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ee0c03c1455..3822d9728b9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a8218e96271790a07dd7065a2ef173e0f67e328 +refs/heads/master: c5be24ff62d238a3fdd5d15461b420cd72e78a14 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index ad141d894e4e..cb93c32027d7 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1435,7 +1435,7 @@ void ip_rt_send_redirect(struct sk_buff *skb) peer->rate_tokens == ip_rt_redirect_number && net_ratelimit()) printk(KERN_WARNING "host %pI4/if%d ignores redirects for %pI4 to %pI4.\n", - &rt->rt_src, rt->rt_iif, + &ip_hdr(skb)->saddr, rt->rt_iif, &rt->rt_dst, &rt->rt_gateway); #endif } @@ -1704,7 +1704,7 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt) __be32 src; if (rt_is_output_route(rt)) - src = rt->rt_src; + src = ip_hdr(skb)->saddr; else { struct fib_result res; struct flowi4 fl4;