From nobody Wed Aug 19 23:17:18 2026 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 4hQMsq0HJ8z6nc17 for ; Wed, 19 Aug 2026 23:17:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hQMsp6Fbhz4126 for ; Wed, 19 Aug 2026 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787181438; 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=EJpQPm/iUvk+f3jCUPkhnCW4wjwEI62cPXPs6blkuBc=; b=f311jW7YR8M/kpDSru+bFzmOp/b5hvJVZcdAGbBHmIjwhlRtTIHIoFGsQUI4z9hs/E0kbz sfS1pfqyLBf2qaN6WTrfudAcLNmVk4ByCGcuy8ABAoksyhS266ZlyY/Ru3wtTBjFPRIZDk xapkOZJfqW926t3WOxjU0PwxlblgPl7nysysBUTQD+ASy+W6PXl/Qz7xra6+yhMIaO4phM Tnz902foTohkXk3ov4kqPwWJwhwkyAnWCM8OuTU2UXIgv8DpeLG4qaiHfQzum4AZX5UOZC eoJAKfw8ZIWth64Ioer9PPct+epqsQLp+qLXJ8HJ3zl/aPrPsp/L390jZ1y1Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787181438; a=rsa-sha256; cv=none; b=OgcuJ7mx02nB/GgpSQOPteia2KnoZ9ZNLbK90/bTrzYUDuL7qA6gqtEIDiY5xbAneXrsjP XqDMHgmTHOdAtF0NAEpTYc1+i7yRfG3yYzQquCFTLGneZ2Ce79D8Hgz1Di3Ila48hToYUq cbVGewsl5KQ/Z4x3VRC4Q9AYDCnof2zj/Eg3/TBDt4KUOj8tByWi6efgN8HhfbkujhErvR vLsSClSrzWEQG2TeIaynCwf8GGN0uYY1knZS9ENv6IndK3Y6JKU4LprO4IQF4ZcQsPST2T xBtfRA6Pe4OU1CaFygtsj0+51GIH+Wa1+uSTtwQ4o0+d+0gw/w7tvwgWqhAQYA== 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=1787181438; 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=EJpQPm/iUvk+f3jCUPkhnCW4wjwEI62cPXPs6blkuBc=; b=KRm5c3HJe8mr0DMuTzJFJiTL1t7PhinvGVDnEX4HIChxazHO6HaMn82C09Tnt/cqBNN5dS 5eOgxM89kwzXhBR0/ZM5kn3Bw3bHV0Z10T5eOdJxUWKlcJC5dbSp9PF9reGI70xiQDk5lV PWEoy24c0A6nKVkbDtjZGGe2nqU6yS2SR9eYIo0psO1zmrZA8t+0l0FVCWqcwtaxQiLLtf k8o8kJPiXNLhPJt7hcoT9rjSbP59I6jQonhwqfnjx1XrnFW+p20ppcbFjw3T0KJFduhnoE KZTDFnTap5+Mzy6BQSsYOodm5dftWcpqWPQw+9L/Nal+tsCjWOubuQd6+WYofQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQMsp4ZjQzr1q for ; Wed, 19 Aug 2026 23:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f045 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Aug 2026 23:17:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fdcb52d03688 - main - ofed/ipoib: convert to timer_setup linuxKPI 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdcb52d03688d92ba4962eea623292b0120e2293 Auto-Submitted: auto-generated Date: Wed, 19 Aug 2026 23:17:18 +0000 Message-Id: <6a86397e.3f045.57cb698d@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fdcb52d03688d92ba4962eea623292b0120e2293 commit fdcb52d03688d92ba4962eea623292b0120e2293 Author: Konstantin Belousov AuthorDate: 2026-08-19 02:14:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-19 23:16:53 +0000 ofed/ipoib: convert to timer_setup linuxKPI Reviewed by: bz Sponsored by: NVidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D58941 --- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c index d6683e45624d..a62785eb4b5f 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -608,9 +608,12 @@ static void ipoib_ah_dev_cleanup(struct ipoib_dev_priv *priv) } } -static void ipoib_ib_tx_timer_func(unsigned long ctx) +static void ipoib_ib_tx_timer_func(struct timer_list *timer) { - drain_tx_cq((struct ipoib_dev_priv *)ctx); + struct ipoib_dev_priv *priv = timer_container_of(priv, timer, + poll_timer); + + drain_tx_cq(priv); } int ipoib_ib_dev_open(struct ipoib_dev_priv *priv) @@ -866,8 +869,7 @@ int ipoib_ib_dev_init(struct ipoib_dev_priv *priv, struct ib_device *ca, int por return -ENODEV; } - setup_timer(&priv->poll_timer, ipoib_ib_tx_timer_func, - (unsigned long) priv); + timer_setup(&priv->poll_timer, ipoib_ib_tx_timer_func, 0); if (if_getflags(dev) & IFF_UP) { if (ipoib_ib_dev_open(priv)) {