The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1026c4c8afcd738f266da06a758f0272ddf7aa
commit ac1026c4c8afcd738f266da06a758f0272ddf7aa Author: Konstantin Belousov <[email protected]> AuthorDate: 2026-08-19 02:14:00 +0000 Commit: Konstantin Belousov <[email protected]> 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)) {
