4 files changed, 8 insertions, 7 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 22b5d818b200..6ca645c4b48e 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1024,7 +1024,6 @@ static struct inet_protosw dccp_v4_protosw = {
         .protocol       = IPPROTO_DCCP,
         .prot           = &dccp_v4_prot,
         .ops            = &inet_dccp_ops,
-        .no_check       = 0,
         .flags          = INET_PROTOSW_ICSK,
 };
 
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index eb892b4f4814..de2c1e719305 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1084,14 +1084,15 @@ EXPORT_SYMBOL_GPL(dccp_shutdown);
 
 static inline int dccp_mib_init(void)
 {
-        return snmp_mib_init((void __percpu **)dccp_statistics,
-                             sizeof(struct dccp_mib),
-                             __alignof__(struct dccp_mib));
+        dccp_statistics = alloc_percpu(struct dccp_mib);
+        if (!dccp_statistics)
+                return -ENOMEM;
+        return 0;
 }
 
 static inline void dccp_mib_exit(void)
 {
-        snmp_mib_free((void __percpu **)dccp_statistics);
+        free_percpu(dccp_statistics);
 }
 
 static int thash_entries;
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 607ab71b5a0c..53731e45403c 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -20,6 +20,7 @@
 
 /* Boundary values */
 static int              zero     = 0,
+                        one      = 1,
                         u8_max   = 0xFF;
 static unsigned long    seqw_min = DCCPF_SEQ_WMIN,
                         seqw_max = 0xFFFFFFFF;          /* maximum on 32 bit */
@@ -58,7 +59,7 @@ static struct ctl_table dccp_default_table[] = {
                 .maxlen         = sizeof(sysctl_dccp_request_retries),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .extra1         = &zero,
+                .extra1         = &one,
                 .extra2         = &u8_max,
         },
         {
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 16f0b223102e..1cd46a345cb0 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -280,7 +280,7 @@ static ktime_t dccp_timestamp_seed;
  */
 u32 dccp_timestamp(void)
 {
-        s64 delta = ktime_us_delta(ktime_get_real(), dccp_timestamp_seed);
+        u64 delta = (u64)ktime_us_delta(ktime_get_real(), dccp_timestamp_seed);
 
         do_div(delta, 10);
         return delta;