diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /net/ipv4/route.c | |
| parent | 8b9411014e6f18a883c18b38f41338dbd53fddea (diff) | |
| parent | e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 2 |
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); |