---

yaml --- r: 189167 b: refs/heads/master c: b35ecb5 h: refs/heads/master i: 189165: 9528cb2 189163: a35f8d2 189159: 6bebdb1 189151: f0369de v: v3
git-mirror · Mar 27, 2010 · 0b53e6f · 0b53e6f
1 parent 940b809
commit 0b53e6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 		}
 	}