summaryrefslogtreecommitdiffstats
path: root/include/net/dn.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-17 02:28:45 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-18 13:39:36 +0200
commiteb4ddaf474285a4c6986f4a1c3205bdb0bed2da9 (patch)
treed88c2cc780254455b2deea9aa1b1b9a92d160c23 /include/net/dn.h
parentMerge branch 'dsa-master-and-slave-helpers' (diff)
downloadlinux-eb4ddaf474285a4c6986f4a1c3205bdb0bed2da9.tar.xz
linux-eb4ddaf474285a4c6986f4a1c3205bdb0bed2da9.zip
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 'include/net/dn.h')
-rw-r--r--include/net/dn.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/dn.h b/include/net/dn.h
index 913b73d239f5..4394f7d5cfe8 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -122,13 +122,6 @@ struct dn_scp /* Session Control Port */
unsigned long keepalive;
void (*keepalive_fxn)(struct sock *sk);
- /*
- * This stuff is for the fast timer for delayed acks
- */
- struct timer_list delack_timer;
- int delack_pending;
- void (*delack_fxn)(struct sock *sk);
-
};
static inline struct dn_scp *DN_SK(struct sock *sk)