Date: Tue, 29 Apr 2025 13:56:07 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 87e57632bf88 - main - ofed: jiffies is unsigned long Message-ID: <202504291356.53TDu7uY003767@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87e57632bf88b270f3f9a09f579372d3437aeb17 commit 87e57632bf88b270f3f9a09f579372d3437aeb17 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-01-31 19:20:01 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2025-04-29 13:53:40 +0000 ofed: jiffies is unsigned long Sponsored by: NVidia networking Differential revision: https://reviews.freebsd.org/D48878 --- sys/ofed/drivers/infiniband/core/ib_addr.c | 6 +++--- sys/ofed/drivers/infiniband/core/ib_sysfs.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_addr.c b/sys/ofed/drivers/infiniband/core/ib_addr.c index 093aab236b39..d033c4801a98 100644 --- a/sys/ofed/drivers/infiniband/core/ib_addr.c +++ b/sys/ofed/drivers/infiniband/core/ib_addr.c @@ -65,7 +65,7 @@ struct addr_req { void *context; void (*callback)(int status, struct sockaddr *src_addr, struct rdma_dev_addr *addr, void *context); - int timeout; + unsigned long timeout; int status; }; @@ -210,9 +210,9 @@ int rdma_translate_ip(const struct sockaddr *addr, } EXPORT_SYMBOL(rdma_translate_ip); -static void set_timeout(int time) +static void set_timeout(unsigned long time) { - int delay; /* under FreeBSD ticks are 32-bit */ + unsigned long delay; delay = time - jiffies; if (delay <= 0) diff --git a/sys/ofed/drivers/infiniband/core/ib_sysfs.c b/sys/ofed/drivers/infiniband/core/ib_sysfs.c index 6c0a8643951d..35451857d16d 100644 --- a/sys/ofed/drivers/infiniband/core/ib_sysfs.c +++ b/sys/ofed/drivers/infiniband/core/ib_sysfs.c @@ -874,7 +874,7 @@ static ssize_t set_stats_lifespan(struct kobject *kobj, struct hw_stats_attribute *hsa; struct rdma_hw_stats *stats; int msecs; - int jiffies; + unsigned long jiffies; int ret; ret = kstrtoint(buf, 10, &msecs);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504291356.53TDu7uY003767>