diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-24 04:45:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-24 23:02:09 -0400 |
| commit | 9c3b57518363577d4e2ea1964ef4fa03e100beaa (patch) | |
| tree | c5edc8dbd5ca3e255e60f5fc32b845e0f6b8ec2a /net/sctp/associola.c | |
| parent | a4cdd9ff1fa4e3a558e2a3b7e6fac3f3105d47c3 (diff) | |
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/associola.c')
| -rw-r--r-- | net/sctp/associola.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index dfb9651e818b..69394f4d6091 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
| @@ -149,8 +149,7 @@ static struct sctp_association *sctp_association_init( | |||
| 149 | 149 | ||
| 150 | /* Initializes the timers */ | 150 | /* Initializes the timers */ |
| 151 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) | 151 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) |
| 152 | setup_timer(&asoc->timers[i], sctp_timer_events[i], | 152 | timer_setup(&asoc->timers[i], sctp_timer_events[i], 0); |
| 153 | (unsigned long)asoc); | ||
| 154 | 153 | ||
| 155 | /* Pull default initialization values from the sock options. | 154 | /* Pull default initialization values from the sock options. |
| 156 | * Note: This assumes that the values have already been | 155 | * Note: This assumes that the values have already been |