net: sctp: migrate cookie life from timeval to ktime

Currently, SCTP code defines its own timeval functions (since timeval
is rarely used inside the kernel by others), namely tv_lt() and
TIMEVAL_ADD() macros, that operate on SCTP cookie expiration.

We might as well remove all those, and operate directly on ktime
structures for a couple of reasons: ktime is available on all archs;
complexity of ktime calculations depending on the arch is less than
(reduces to a simple arithmetic operations on archs with
BITS_PER_LONG == 64 or CONFIG_KTIME_SCALAR) or equal to timeval
functions (other archs); code becomes more readable; macros can be
thrown out.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 7 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index bf6e6bd553c0..9a383a8774e8 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -102,13 +102,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a
         sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);
 
         asoc->state = SCTP_STATE_CLOSED;
-
-        /* Set these values from the socket values, a conversion between
-         * millsecons to seconds/microseconds must also be done.
-         */
-        asoc->cookie_life.tv_sec = sp->assocparams.sasoc_cookie_life / 1000;
-        asoc->cookie_life.tv_usec = (sp->assocparams.sasoc_cookie_life % 1000)
-                                        * 1000;
+        asoc->cookie_life = ms_to_ktime(sp->assocparams.sasoc_cookie_life);
         asoc->frag_point = 0;
         asoc->user_frag = sp->user_frag;