diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 01:46:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-25 13:00:27 +0900 |
| commit | dda436b7accffd5313e8fd8338f724376c6fcda2 (patch) | |
| tree | 7d66d2102e889dbec3bff3f6bf6ecfccc8b87793 /net/hsr/hsr_device.c | |
| parent | 839a6094140ade97ccc548fcd63179506c5d7fe4 (diff) | |
| download | linux-stable-dda436b7accffd5313e8fd8338f724376c6fcda2.tar.gz linux-stable-dda436b7accffd5313e8fd8338f724376c6fcda2.tar.bz2 linux-stable-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_device.c')
| -rw-r--r-- | net/hsr/hsr_device.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 172d8309f89e..b8cd43c9ed5b 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -328,12 +328,12 @@ out: /* Announce (supervision frame) timer function */ -static void hsr_announce(unsigned long data) +static void hsr_announce(struct timer_list *t) { struct hsr_priv *hsr; struct hsr_port *master; - hsr = (struct hsr_priv *) data; + hsr = from_timer(hsr, t, announce_timer); rcu_read_lock(); master = hsr_port_get_hsr(hsr, HSR_PT_MASTER); @@ -463,9 +463,8 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], hsr->sequence_nr = HSR_SEQNR_START; hsr->sup_sequence_nr = HSR_SUP_SEQNR_START; - setup_timer(&hsr->announce_timer, hsr_announce, (unsigned long)hsr); - - setup_timer(&hsr->prune_timer, hsr_prune_nodes, (unsigned long)hsr); + timer_setup(&hsr->announce_timer, hsr_announce, 0); + timer_setup(&hsr->prune_timer, hsr_prune_nodes, 0); ether_addr_copy(hsr->sup_multicast_addr, def_multicast_addr); hsr->sup_multicast_addr[ETH_ALEN - 1] = multicast_spec; |