diff options
| author | Colin Cross <ccross@android.com> | 2012-03-02 12:34:55 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-02 12:34:55 -0800 |
| commit | a5d2e61148fba0f09499c4b65902adebc391350b (patch) | |
| tree | 4d21ec2e79479d54d2a1a22bade9c3f0438c5624 /net | |
| parent | fbd94b86e411e6ea0b4fa56682120b32af5c16c2 (diff) | |
| parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) | |
Merge commit 'v3.3-rc5' into android-3.3
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c78aa2ce183..ee7944130c3 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3255,7 +3255,8 @@ void __init tcp_init(void) { struct sk_buff *skb = NULL; unsigned long limit; - int i, max_share, cnt; + int max_share, cnt; + unsigned int i; unsigned long jiffy = jiffies; BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb)); @@ -3298,7 +3299,7 @@ void __init tcp_init(void) &tcp_hashinfo.bhash_size, NULL, 64 * 1024); - tcp_hashinfo.bhash_size = 1 << tcp_hashinfo.bhash_size; + tcp_hashinfo.bhash_size = 1U << tcp_hashinfo.bhash_size; for (i = 0; i < tcp_hashinfo.bhash_size; i++) { spin_lock_init(&tcp_hashinfo.bhash[i].lock); INIT_HLIST_HEAD(&tcp_hashinfo.bhash[i].chain); |