diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 01:45:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-25 12:02:09 +0900 |
| commit | 9c3b57518363577d4e2ea1964ef4fa03e100beaa (patch) | |
| tree | c5edc8dbd5ca3e255e60f5fc32b845e0f6b8ec2a /net/sctp/protocol.c | |
| parent | a4cdd9ff1fa4e3a558e2a3b7e6fac3f3105d47c3 (diff) | |
| download | linux-rpi3-9c3b57518363577d4e2ea1964ef4fa03e100beaa.tar.gz linux-rpi3-9c3b57518363577d4e2ea1964ef4fa03e100beaa.tar.bz2 linux-rpi3-9c3b57518363577d4e2ea1964ef4fa03e100beaa.zip | |
net: sctp: 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: Vlad Yasevich <vyasevich@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-sctp@vger.kernel.org
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/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index fcd80feb293f..f5172c21349b 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -622,9 +622,9 @@ static void sctp_v4_ecn_capable(struct sock *sk) INET_ECN_xmit(sk); } -static void sctp_addr_wq_timeout_handler(unsigned long arg) +static void sctp_addr_wq_timeout_handler(struct timer_list *t) { - struct net *net = (struct net *)arg; + struct net *net = from_timer(net, t, sctp.addr_wq_timer); struct sctp_sockaddr_entry *addrw, *temp; struct sctp_sock *sp; @@ -1304,8 +1304,7 @@ static int __net_init sctp_defaults_init(struct net *net) INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); spin_lock_init(&net->sctp.addr_wq_lock); net->sctp.addr_wq_timer.expires = 0; - setup_timer(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, - (unsigned long)net); + timer_setup(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, 0); return 0; |