From nobody Wed Aug 26 00:48:15 2026 X-Original-To: dev-commits-src-all@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 4hV5c06rXfz6qKfM for ; Wed, 26 Aug 2026 00:48:16 +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 4hV5c02wF2z3sWp for ; Wed, 26 Aug 2026 00:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787705296; 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=yYMoWFa+DEKqXczK13wGMhCLT7s7RKvYDt23FkF8Fnw=; b=iZFozaFxX0VNYPNZ+CmFQqBykIBRjIIAIEcC9bZ1paQY83yKsdCLCOmDWtyoR1CvkUBes+ hi4cuiLHve5mvaZ/2SNzkij0pKCXDzV/+qeWhauHdEksJCoXv+88JVrQLlITMKizLbKumi u0dX0Kdwvqx8MW7Tl5y5HhsJB1gHYWyZwlg/8FPgyIXZ2Y1E9vv511GN20HWb5gaBVZdiM o3W6QfUjVojEI1bS7ut1DdGIAVJ68cViWUTiQHlD+bSPP9VJp9XZi3iXiKjHSzNXAvY9Hg ofuXbq4MUZAfTkqNCFyLD9CfWWrURBSOGzB5CJxWCJxapYOUJ1z6xSkswQXGog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787705296; a=rsa-sha256; cv=none; b=IHOPnoEh5/Hdv8Bu8DDeXHwTMl5KLbLl5onQJDcoX5pov+DQfMuFZbWVV1rInYGIqZGpum +H4i4tQyuu+Bc7OmWCgCzpvVAeS8comllwUrhflCpKHfFBS1rOCS8aHT42bnbnW7qh5ws1 VKC0MUyJFgRoOT3JfhD/Zm5QEW2ZWNH7DujjhhXw0/MLKIycnvHvJVz+R4XS91uGNeVdkS KbYCsEHtVrIvaAO3evQpJbdhNy02fxTkERsAioUla45tPNCtQTPFeeiagCqLYkd9vATm9S ufhkY9kp+CBEocekf+vSB8bzgh8OJ1HJaU4vKjTvocZnLVBSPN38gIaU+3ymOg== 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=1787705296; 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=yYMoWFa+DEKqXczK13wGMhCLT7s7RKvYDt23FkF8Fnw=; b=ZtYsHzLZrtmm6inSbUODcN8QOrZq0NyEAwvg2OtJhSHBZr/lkLiykOyLuTNCnugrL1cgOD o0QdhxLGOBmAZNQL3XiNHGh3m9aUHZDvxXMePRGLhjlWSqiQ/tg8fHV4VAkhtqOgw3WG36 EQCdpC37PQr4a6vCLvMLDbo/9kdlBtzjVQmQdAgYB9kijlLfUgeSBF4CCA2YOmzH+hL06y WWfR44werOdK+AEXEs/RqChCvLV/NtzkzA6lReRRJuD8GCzijJxkwqx1CTvYmG5TolyHHL Zdbh6aq84vueWkuivcvkUcbW+Zsx3jXGx+RrunUKY6E6+J5+PzzZeeCYJVIXxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hV5bz5trGztJ for ; Wed, 26 Aug 2026 00:48:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41176 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 00:48:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ac1026c4c8af - stable/15 - ofed/ipoib: convert to timer_setup linuxKPI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: ac1026c4c8afcd738f266da06a758f0272ddf7aa Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 00:48:15 +0000 Message-Id: <6a8e37cf.41176.17bdd575@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1026c4c8afcd738f266da06a758f0272ddf7aa commit ac1026c4c8afcd738f266da06a758f0272ddf7aa Author: Konstantin Belousov AuthorDate: 2026-08-19 02:14:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-26 00:44:11 +0000 ofed/ipoib: convert to timer_setup linuxKPI (cherry picked from commit fdcb52d03688d92ba4962eea623292b0120e2293) --- 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 f3d377d513a8..4f272efe7d58 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -607,9 +607,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) @@ -865,8 +868,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)) {