diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 07:58:36 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 07:58:36 +0100 |
| commit | 6946d28a9f47f50fe3dd916e8b4229de9769108e (patch) | |
| tree | eaa7499bf7fd367cbacf777d8eec8ed038ef287d /net/ipv4/route.c | |
| parent | [libata sata_promise] minor whitespace cleanup (diff) | |
| parent | Linux v2.6.15-rc4 (diff) | |
| download | linux-6946d28a9f47f50fe3dd916e8b4229de9769108e.tar.xz linux-6946d28a9f47f50fe3dd916e8b4229de9769108e.zip | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 381dd6a6aebb..f701a136a6ae 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1371,7 +1371,7 @@ out: kfree_skb(skb); * are needed for AMPRnet AX.25 paths. */ -static unsigned short mtu_plateau[] = +static const unsigned short mtu_plateau[] = {32000, 17914, 8166, 4352, 2002, 1492, 576, 296, 216, 128 }; static __inline__ unsigned short guess_mtu(unsigned short old_mtu) @@ -3149,8 +3149,7 @@ int __init ip_rt_init(void) sizeof(struct rt_hash_bucket), rhash_entries, (num_physpages >= 128 * 1024) ? - (27 - PAGE_SHIFT) : - (29 - PAGE_SHIFT), + 15 : 17, HASH_HIGHMEM, &rt_hash_log, &rt_hash_mask, |