From nobody Tue Apr 29 13:56:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zn20S03k2z5v3rx; Tue, 29 Apr 2025 13:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn20R5n4Cz45gS; Tue, 29 Apr 2025 13:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745934967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPaYeMS7KWwfbzxfHEWNqRiVPg2spmXyG8NIcpvI4Ng=; b=t5nhAiNiCGBhEbfYDvKZ/Tyvkdfr3+R2rOwvV8Fr5bteebFcepSmU8rdxbS5+4bxCsl+sh q/lC2suUeCkp7X/hncWr7/Gqcz/A1D1fqvY4S9F3zPe6YxjxJYLbrjARetk12TlAzmJW0U tVcK2zy1q0hgkDiD0+LhK7aODl65AeL/DSFw29q9QMONrmg4unIwUti0OQPigg1DsuJNsF ilfCoa1BnO1IX0EGH3OcBDCw8Ytpn+w6ELwehHm80FClSJWfOkaktAGfALJpyBXnt76eit /9n7Gfu1tc5xuk0LbKgxvie8SiIkl4Xb1Ebrx/p9Q2lYYc/q7XifWNWr9UBjAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745934967; a=rsa-sha256; cv=none; b=m2vLO7HBtKuwuKngB+ErloBVmH//ail/3ZP+d++pI/bl9nKEd++w0FQJnfcIEHnyR4v6JY KXw6EV7T11PIuuGXXze+5kMGTDfWEs24JV7V2IE1I9/M7hPAaEdfuysDQWMDN0T8pA+J3S 7AlpCXv481nmMDilaUaAj1XhKDqPAkWydljN9eeBnuCBzCyRsxBEREqjD/2j6uRS2nOimQ ifYIWNG/SSd3gk/qcUUzxMh7ZWm26PK+SSEGX2orQfE7X9sS5BJQpMzrx+kvytpIKWrv3M DfBtS1UgE5Rfez+bf3dEfC9uxGUDNmWIPe8Z0NeWZaRNoKw7kXZeI1rMxGalyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745934967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CPaYeMS7KWwfbzxfHEWNqRiVPg2spmXyG8NIcpvI4Ng=; b=Dcm48uYHtmD6Egx8mw7cr9unfVmXH8Qyt+rWI6AyXbsG/sq4DxTiZ4NazLQO8wzG9ifcuQ m5jKz3eBQf1VvPhafY4lAo0D30GaX5mct8wCXeTJeuAt4G2aGtPR9dPN0Ehx8cZrWE+4tE zQKemXbjnCiarNw/EvHAU+uefyY5sMc0RZT9knYYH0jxFaoL7KTrdz1UGWBnTUyjgE/CGZ y4LG1mixrzGCAZsTZwHhbQBI71MC4vnqLq+UzaGKsL1DUmvWWAy9k/zUfye0XG07xwgBi/ PFBg70WrD3wJ7vWbIAjS084drT+5F3y4ckyOknUPZk5CG7qarY72X8DFI0+L3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zn20R5D8zz7rk; Tue, 29 Apr 2025 13:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TDu7P7003770; Tue, 29 Apr 2025 13:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TDu7uY003767; Tue, 29 Apr 2025 13:56:07 GMT (envelope-from git) Date: Tue, 29 Apr 2025 13:56:07 GMT Message-Id: <202504291356.53TDu7uY003767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 87e57632bf88 - main - ofed: jiffies is unsigned long List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87e57632bf88b270f3f9a09f579372d3437aeb17 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87e57632bf88b270f3f9a09f579372d3437aeb17 commit 87e57632bf88b270f3f9a09f579372d3437aeb17 Author: Konstantin Belousov AuthorDate: 2025-01-31 19:20:01 +0000 Commit: Mark Johnston 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);