summaryrefslogtreecommitdiffstats
path: root/net/hsr/hsr_framereg.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 10:46:16 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-25 06:00:27 +0200
commitdda436b7accffd5313e8fd8338f724376c6fcda2 (patch)
tree7d66d2102e889dbec3bff3f6bf6ecfccc8b87793 /net/hsr/hsr_framereg.h
parentnet: dccp: Convert timers to use timer_setup() (diff)
downloadlinux-dda436b7accffd5313e8fd8338f724376c6fcda2.tar.xz
linux-dda436b7accffd5313e8fd8338f724376c6fcda2.zip
net: hsr: 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: Arvid Brodin <arvid.brodin@alten.se> Cc: "David S. Miller" <davem@davemloft.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/hsr/hsr_framereg.h')
-rw-r--r--net/hsr/hsr_framereg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hsr/hsr_framereg.h b/net/hsr/hsr_framereg.h
index 4e04f0e868e9..370b45998121 100644
--- a/net/hsr/hsr_framereg.h
+++ b/net/hsr/hsr_framereg.h
@@ -33,7 +33,7 @@ void hsr_register_frame_in(struct hsr_node *node, struct hsr_port *port,
int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node,
u16 sequence_nr);
-void hsr_prune_nodes(unsigned long data);
+void hsr_prune_nodes(struct timer_list *t);
int hsr_create_self_node(struct list_head *self_node_db,
unsigned char addr_a[ETH_ALEN],