diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
commit | 606c0dafbe88102d64c1253caed8a2c36987070f (patch) | |
tree | 23ce7b30341e71c6da8e0183d27e29167e833e26 /net/ipv4/route.c | |
parent | 6ab16d249513a50bef3f1b275cea6aa8d3f51832 (diff) | |
parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
download | talos-op-linux-606c0dafbe88102d64c1253caed8a2c36987070f.tar.gz talos-op-linux-606c0dafbe88102d64c1253caed8a2c36987070f.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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, |