diff options
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9ac7a4f46bd8..ef98b14ac56d 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1413,7 +1413,7 @@ recv_urg: | |||
1413 | * closed. | 1413 | * closed. |
1414 | */ | 1414 | */ |
1415 | 1415 | ||
1416 | static unsigned char new_state[16] = { | 1416 | static const unsigned char new_state[16] = { |
1417 | /* current state: new state: action: */ | 1417 | /* current state: new state: action: */ |
1418 | /* (Invalid) */ TCP_CLOSE, | 1418 | /* (Invalid) */ TCP_CLOSE, |
1419 | /* TCP_ESTABLISHED */ TCP_FIN_WAIT1 | TCP_ACTION_FIN, | 1419 | /* TCP_ESTABLISHED */ TCP_FIN_WAIT1 | TCP_ACTION_FIN, |
@@ -2065,8 +2065,7 @@ void __init tcp_init(void) | |||
2065 | sizeof(struct inet_ehash_bucket), | 2065 | sizeof(struct inet_ehash_bucket), |
2066 | thash_entries, | 2066 | thash_entries, |
2067 | (num_physpages >= 128 * 1024) ? | 2067 | (num_physpages >= 128 * 1024) ? |
2068 | (25 - PAGE_SHIFT) : | 2068 | 13 : 15, |
2069 | (27 - PAGE_SHIFT), | ||
2070 | HASH_HIGHMEM, | 2069 | HASH_HIGHMEM, |
2071 | &tcp_hashinfo.ehash_size, | 2070 | &tcp_hashinfo.ehash_size, |
2072 | NULL, | 2071 | NULL, |
@@ -2082,8 +2081,7 @@ void __init tcp_init(void) | |||
2082 | sizeof(struct inet_bind_hashbucket), | 2081 | sizeof(struct inet_bind_hashbucket), |
2083 | tcp_hashinfo.ehash_size, | 2082 | tcp_hashinfo.ehash_size, |
2084 | (num_physpages >= 128 * 1024) ? | 2083 | (num_physpages >= 128 * 1024) ? |
2085 | (25 - PAGE_SHIFT) : | 2084 | 13 : 15, |
2086 | (27 - PAGE_SHIFT), | ||
2087 | HASH_HIGHMEM, | 2085 | HASH_HIGHMEM, |
2088 | &tcp_hashinfo.bhash_size, | 2086 | &tcp_hashinfo.bhash_size, |
2089 | NULL, | 2087 | NULL, |