Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae4b6b2 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Stefan Richter
Browse files

firewire: nosy: Replace timeval with timespec64 



32 bit systems using 'struct timeval' will break in the year 2038, so
we replace the code appropriately. However, this driver is not broken
in 2038 since we are using only the microseconds portion of the
current time.

This patch replaces timeval with timespec64.

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 100ceb66

drivers/firewire/nosy.c

+6 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/sched.h> /* required for linux/wait.h */

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/time64.h>

#include <linux/timex.h>

#include <linux/uaccess.h>

#include <linux/wait.h>
@@ -413,17 +414,18 @@ static void 
packet_irq_handler(struct pcilynx *lynx)

{

	struct client *client;

	u32 tcode_mask, tcode;

	u32 tcode_mask, tcode, timestamp;

	size_t length;

	struct timeval tv;

	struct timespec64 ts64;



	/* FIXME: Also report rcv_speed. */



	length = __le32_to_cpu(lynx->rcv_pcl->pcl_status) & 0x00001fff;

	tcode  = __le32_to_cpu(lynx->rcv_buffer[1]) >> 4 & 0xf;



	do_gettimeofday(&tv);

	lynx->rcv_buffer[0] = (__force __le32)tv.tv_usec;

	ktime_get_real_ts64(&ts64);

	timestamp = ts64.tv_nsec / NSEC_PER_USEC;

	lynx->rcv_buffer[0] = (__force __le32)timestamp;



	if (length == PHY_PACKET_SIZE)

		tcode_mask = 1 << TCODE_PHY_PACKET;