mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function and timer->data together with calling init_timer(timer). There is already a helper for this. Use it for networking code. The patch is HUGE, but makes the code 130 lines shorter (98 insertions(+), 228 deletions(-)). Signed-off-by: Pavel Emelyanov <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
a92aa318b4
commit
b24b8a247f
47 changed files with 98 additions and 228 deletions
|
|
@ -167,11 +167,9 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
|
|||
sp->autoclose * HZ;
|
||||
|
||||
/* Initilizes the timers */
|
||||
for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) {
|
||||
init_timer(&asoc->timers[i]);
|
||||
asoc->timers[i].function = sctp_timer_events[i];
|
||||
asoc->timers[i].data = (unsigned long) asoc;
|
||||
}
|
||||
for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i)
|
||||
setup_timer(&asoc->timers[i], sctp_timer_events[i],
|
||||
(unsigned long)asoc);
|
||||
|
||||
/* Pull default initialization values from the sock options.
|
||||
* Note: This assumes that the values have already been
|
||||
|
|
|
|||
|
|
@ -99,15 +99,10 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
|
|||
INIT_LIST_HEAD(&peer->send_ready);
|
||||
INIT_LIST_HEAD(&peer->transports);
|
||||
|
||||
/* Set up the retransmission timer. */
|
||||
init_timer(&peer->T3_rtx_timer);
|
||||
peer->T3_rtx_timer.function = sctp_generate_t3_rtx_event;
|
||||
peer->T3_rtx_timer.data = (unsigned long)peer;
|
||||
|
||||
/* Set up the heartbeat timer. */
|
||||
init_timer(&peer->hb_timer);
|
||||
peer->hb_timer.function = sctp_generate_heartbeat_event;
|
||||
peer->hb_timer.data = (unsigned long)peer;
|
||||
setup_timer(&peer->T3_rtx_timer, sctp_generate_t3_rtx_event,
|
||||
(unsigned long)peer);
|
||||
setup_timer(&peer->hb_timer, sctp_generate_heartbeat_event,
|
||||
(unsigned long)peer);
|
||||
|
||||
/* Initialize the 64-bit random nonce sent with heartbeat. */
|
||||
get_random_bytes(&peer->hb_nonce, sizeof(peer->hb_nonce));
|
||||
|
|
|
|||
Loading…
Reference in a new issue