diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /net/ipv4/route.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
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); |