From 0b53e6f651a74fb56cda5a105fabb5704f0c04d1 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 24 Mar 2010 07:43:17 +0000 Subject: [PATCH] --- yaml --- r: 189167 b: refs/heads/master c: b35ecb5d404c00f2420221ccbb1bbba1139353a4 h: refs/heads/master i: 189165: 9528cb2bd384e69346a448a85af84127f144300b 189163: a35f8d24ce7fed72410a290fdd4ad2fb4d1bb706 189159: 6bebdb14d1bc802ef16ea92299a51bcf53b081f3 189151: f0369dee00e801de5fc6c0606f67ef6bd68c78ea v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 11209c73bf2b..de82ef8803d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b97efdf392563bf03b4917a0b5add2df65de39a +refs/heads/master: b35ecb5d404c00f2420221ccbb1bbba1139353a4 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 54fd68c14c87..124af1605d10 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1212,11 +1212,11 @@ static int rt_intern_hash(unsigned hash, struct rtable *rt, slow_chain_length(rt_hash_table[hash].chain) > rt_chain_length_max) { struct net *net = dev_net(rt->u.dst.dev); int num = ++net->ipv4.current_rt_cache_rebuild_count; - if (!rt_caching(dev_net(rt->u.dst.dev))) { + if (!rt_caching(net)) { printk(KERN_WARNING "%s: %d rebuilds is over limit, route caching disabled\n", rt->u.dst.dev->name, num); } - rt_emergency_hash_rebuild(dev_net(rt->u.dst.dev)); + rt_emergency_hash_rebuild(net); } }