From 77fb1d41181f963f5674af0b86e7f460a342e624 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Thu, 6 Dec 2007 02:19:07 -0800 Subject: [PATCH] --- yaml --- r: 74690 b: refs/heads/master c: 56c99d0415e8b778c200f115b198c126243ec351 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/route.h | 1 - trunk/net/ipv4/route.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e2c646adb629..8113cba1c3f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f53878dc2618bf7c01e2135bd271ac01bd85dc9 +refs/heads/master: 56c99d0415e8b778c200f115b198c126243ec351 diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h index f7ce6259f86f..59b0b19205a2 100644 --- a/trunk/include/net/route.h +++ b/trunk/include/net/route.h @@ -109,7 +109,6 @@ struct in_device; extern int ip_rt_init(void); extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, __be32 src, struct net_device *dev); -extern void ip_rt_advice(struct rtable **rp, int advice); extern void rt_cache_flush(int how); extern int __ip_route_output_key(struct rtable **, const struct flowi *flp); extern int ip_route_output_key(struct rtable **, struct flowi *flp); diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 79c4b9360a12..d2bc6148a737 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1161,7 +1161,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst) unsigned hash = rt_hash(rt->fl.fl4_dst, rt->fl.fl4_src, rt->fl.oif); #if RT_CACHE_DEBUG >= 1 - printk(KERN_DEBUG "ip_rt_advice: redirect to " + printk(KERN_DEBUG "ipv4_negative_advice: redirect to " "%u.%u.%u.%u/%02x dropped\n", NIPQUAD(rt->rt_dst), rt->fl.fl4_tos); #endif