diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-27 12:41:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-30 15:26:32 +0100 |
| commit | 311af51dcb5629f04976a8e451673f77e3301041 (patch) | |
| tree | 9dc97dea04bbc8493830a0dd464f6620e5d09f96 /net/openvswitch | |
| parent | netxen: remove timespec usage (diff) | |
| download | linux-311af51dcb5629f04976a8e451673f77e3301041.tar.xz linux-311af51dcb5629f04976a8e451673f77e3301041.zip | |
openvswitch: use ktime_get_ts64() instead of ktime_get_ts()
timespec is deprecated because of the y2038 overflow, so let's convert
this one to ktime_get_ts64(). The code is already safe even on 32-bit
architectures, since it uses monotonic times. On 64-bit architectures,
nothing changes, while on 32-bit architectures this avoids one
type conversion.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/flow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index dbe2379329c5..76d050aba7a4 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -56,12 +56,12 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies) { - struct timespec cur_ts; + struct timespec64 cur_ts; u64 cur_ms, idle_ms; - ktime_get_ts(&cur_ts); + ktime_get_ts64(&cur_ts); idle_ms = jiffies_to_msecs(jiffies - flow_jiffies); - cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC + + cur_ms = (u64)(u32)cur_ts.tv_sec * MSEC_PER_SEC + cur_ts.tv_nsec / NSEC_PER_MSEC; return cur_ms - idle_ms; |