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_framereg.c | |
| parent | net: dccp: Convert timers to use timer_setup() (diff) | |
| download | linux-dev-dda436b7accffd5313e8fd8338f724376c6fcda2.tar.xz linux-dev-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.c')
| -rw-r--r-- | net/hsr/hsr_framereg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 284a9b820df8..286ceb41ac0c 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -365,16 +365,14 @@ static struct hsr_port *get_late_port(struct hsr_priv *hsr, /* Remove stale sequence_nr records. Called by timer every * HSR_LIFE_CHECK_INTERVAL (two seconds or so). */ -void hsr_prune_nodes(unsigned long data) +void hsr_prune_nodes(struct timer_list *t) { - struct hsr_priv *hsr; + struct hsr_priv *hsr = from_timer(hsr, t, prune_timer); struct hsr_node *node; struct hsr_port *port; unsigned long timestamp; unsigned long time_a, time_b; - hsr = (struct hsr_priv *) data; - rcu_read_lock(); list_for_each_entry_rcu(node, &hsr->node_db, mac_list) { /* Shorthand */ |