diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 17:28:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-18 12:39:36 +0100 |
| commit | eb4ddaf474285a4c6986f4a1c3205bdb0bed2da9 (patch) | |
| tree | d88c2cc780254455b2deea9aa1b1b9a92d160c23 /net/decnet/af_decnet.c | |
| parent | 1bbc728988f09e40c83585cf3322b1f6c1aa17b5 (diff) | |
| download | linux-eb4ddaf474285a4c6986f4a1c3205bdb0bed2da9.tar.bz2 | |
net/decnet: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: David Ahern <dsa@cumulusnetworks.com>
Cc: linux-decnet-user@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 73a0399dc7a2..d4c9a8bbad3e 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -533,10 +533,6 @@ static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gf scp->keepalive = 10 * HZ; scp->keepalive_fxn = dn_keepalive; - init_timer(&scp->delack_timer); - scp->delack_pending = 0; - scp->delack_fxn = dn_nsp_delayed_ack; - dn_start_slow_timer(sk); out: return sk; |