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>
This commit is contained in:

committed by
David S. Miller

parent
d36f82b243
commit
52db882f3f
@@ -54,7 +54,7 @@
|
||||
#ifndef __sctp_structs_h__
|
||||
#define __sctp_structs_h__
|
||||
|
||||
#include <linux/time.h> /* We get struct timespec. */
|
||||
#include <linux/ktime.h>
|
||||
#include <linux/socket.h> /* linux/in.h needs this!! */
|
||||
#include <linux/in.h> /* We get struct sockaddr_in. */
|
||||
#include <linux/in6.h> /* We get struct in6_addr */
|
||||
@@ -284,7 +284,7 @@ struct sctp_cookie {
|
||||
__u32 peer_ttag;
|
||||
|
||||
/* When does this cookie expire? */
|
||||
struct timeval expiration;
|
||||
ktime_t expiration;
|
||||
|
||||
/* Number of inbound/outbound streams which are set
|
||||
* and negotiated during the INIT process.
|
||||
@@ -1537,7 +1537,7 @@ struct sctp_association {
|
||||
sctp_state_t state;
|
||||
|
||||
/* The cookie life I award for any cookie. */
|
||||
struct timeval cookie_life;
|
||||
ktime_t cookie_life;
|
||||
|
||||
/* Overall : The overall association error count.
|
||||
* Error Count : [Clear this any time I get something.]
|
||||
|
Reference in New Issue
Block a user