diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 07:34:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 07:34:11 -0800 |
| commit | 3ee783a3e4867ce5691bfa6a818959e88a50f209 (patch) | |
| tree | 4263289a5f8551500c0c66bbb0c7ab01a4e8e075 /net/ipv4/tcp.c | |
| parent | 80c218812786f619c9a1ce50d0e7c32c7afde4de (diff) | |
| parent | 375d9d71838970030c8e0bf0ac2abcc1a3487df8 (diff) | |
| download | kernel_samsung_smdk4412-3ee783a3e4867ce5691bfa6a818959e88a50f209.tar.gz kernel_samsung_smdk4412-3ee783a3e4867ce5691bfa6a818959e88a50f209.tar.bz2 kernel_samsung_smdk4412-3ee783a3e4867ce5691bfa6a818959e88a50f209.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DECNET]: Endianess fixes (try #2)
[TG3]: Fix array overrun in tg3_read_partno().
[NET]: Set truesize in pskb_copy
[NETPOLL]: Compute checksum properly in netpoll_send_udp().
[PKT_SCHED] sch_htb: Use hlist_del_init().
[TCP]: Don't use highmem in tcp hash size calculation.
[NET]: kconfig, correct traffic shaper
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 66e9a729f6d..4322318ab33 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2270,7 +2270,7 @@ void __init tcp_init(void) thash_entries, (num_physpages >= 128 * 1024) ? 13 : 15, - HASH_HIGHMEM, + 0, &tcp_hashinfo.ehash_size, NULL, 0); @@ -2286,7 +2286,7 @@ void __init tcp_init(void) tcp_hashinfo.ehash_size, (num_physpages >= 128 * 1024) ? 13 : 15, - HASH_HIGHMEM, + 0, &tcp_hashinfo.bhash_size, NULL, 64 * 1024); |