aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-19 17:27:27 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:27:27 -0400
commit499792ec6dc737467e5486527cef95ed7d74fba9 (patch)
treeb88c4ef9d4491c17f71d26d33e73f05f7c7ea6a0 /net/ipv4/route.c
parent421b20b9c44b3fcdc07d6af875dad5ae86fad014 (diff)
parentd14b50cc60ca465290fcdb3b88e7d5fb684361ed (diff)
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 19bd49d69d9f..b873cbcdd0b8 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3157,7 +3157,7 @@ int __init ip_rt_init(void)
3157 rhash_entries, 3157 rhash_entries,
3158 (num_physpages >= 128 * 1024) ? 3158 (num_physpages >= 128 * 1024) ?
3159 15 : 17, 3159 15 : 17,
3160 HASH_HIGHMEM, 3160 0,
3161 &rt_hash_log, 3161 &rt_hash_log,
3162 &rt_hash_mask, 3162 &rt_hash_mask,
3163 0); 3163 0);