1 files changed, 3 insertions, 3 deletions

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 63b3fa20e14b..cf28c53a389a 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -478,7 +478,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
                         err = -EINVAL;
                 else
                         err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,
-                                                     (struct dccp_so_feat __user *)
+                                                     (struct dccp_so_feat __user *)
                                                      optval);
                 break;
         case DCCP_SOCKOPT_CHANGE_R:
@@ -1024,7 +1024,6 @@ static int __init dccp_init(void)
         do {
                 dccp_hashinfo.ehash_size = (1UL << ehash_order) * PAGE_SIZE /
                                         sizeof(struct inet_ehash_bucket);
-                dccp_hashinfo.ehash_size >>= 1;
                 while (dccp_hashinfo.ehash_size &
                        (dccp_hashinfo.ehash_size - 1))
                         dccp_hashinfo.ehash_size--;
@@ -1037,9 +1036,10 @@ static int __init dccp_init(void)
                 goto out_free_bind_bucket_cachep;
         }
 
-        for (i = 0; i < (dccp_hashinfo.ehash_size << 1); i++) {
+        for (i = 0; i < dccp_hashinfo.ehash_size; i++) {
                 rwlock_init(&dccp_hashinfo.ehash[i].lock);
                 INIT_HLIST_HEAD(&dccp_hashinfo.ehash[i].chain);
+                INIT_HLIST_HEAD(&dccp_hashinfo.ehash[i].twchain);
         }
 
         bhash_order = ehash_order;