1 files changed, 1 insertions, 23 deletions

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 1cd46a345cb0..3ef7acef3ce8 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -161,33 +161,11 @@ out:
         sock_put(sk);
 }
 
-/*
- *      Timer for listening sockets
- */
-static void dccp_response_timer(struct sock *sk)
-{
-        inet_csk_reqsk_queue_prune(sk, TCP_SYNQ_INTERVAL, DCCP_TIMEOUT_INIT,
-                                   DCCP_RTO_MAX);
-}
-
 static void dccp_keepalive_timer(unsigned long data)
 {
         struct sock *sk = (struct sock *)data;
 
-        /* Only process if socket is not in use. */
-        bh_lock_sock(sk);
-        if (sock_owned_by_user(sk)) {
-                /* Try again later. */
-                inet_csk_reset_keepalive_timer(sk, HZ / 20);
-                goto out;
-        }
-
-        if (sk->sk_state == DCCP_LISTEN) {
-                dccp_response_timer(sk);
-                goto out;
-        }
-out:
-        bh_unlock_sock(sk);
+        pr_err("dccp should not use a keepalive timer !\n");
         sock_put(sk);
 }