From nobody Sat Sep 28 09:26:13 2024 X-Original-To: dev-commits-src-branches@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 4XG25L0rNFz5Y36P; Sat, 28 Sep 2024 09:26:14 +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 4XG25K4r6lz4s5S; Sat, 28 Sep 2024 09:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727515573; 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=gCs3j7OqP+8P933fetQ6kI8+Am60LeTuEimO5JRONHM=; b=upsZRbqfw4nB8NnmBwuCUSARIPuTPoyoYPcVLsAOndymG2eI8MzCH3EzuMWT6/EMEAHw/b pY1remULCmjfL581KbHxaEyjl1jXu7rYZ6XaaAMXAW155+CtZmNln4wYXui9Vov1rhw6+b EsmHbFO5q1vezclPO8+TJLVI6qY6ZbByZbbR/+7IUwpreQZIHoPJfRePgwKfqraNTO4Jhj oOww0ckeIrMIYEttBfbjfpqjxgqX3h7ahZos+JaAs3Xx0vT2ccVKEx1MjTuY0/wPZ/Qc4s 2YMGd0EEBldrbOv08H83Coio/4SfSw+inL8G94AzsoahMfLbk9k7+cB1TQhucw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727515573; 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=gCs3j7OqP+8P933fetQ6kI8+Am60LeTuEimO5JRONHM=; b=ZcNj+3Be0RV7oPq+Pe2JDkzZr978mooFLljC/IvLrqmZik5UotJYcoSx3NJYyRW1uUc70p BQhgPGOgudr4stEyTELk6K454a41K0E6KDKaqvEmL5MbqijtROSi31dTNhoAXTuOInRYkC wZT5OqyHiXklEu4capgl6HjWnCz6536OrNP8Q6mc6tWOGaiDuha3rDYTsVfM0RpjLK11er x23QIHpIC+/37LDli6iCRliqo8+mH0dvt+Mt+ryKyA3GpyiH1l7sMCVcQjnA2vBqn1tfTJ 4tkhTMaKfUnFSbu8JUIZ/SHwtfI8iFcEahNaG6JcapWCLckNe83zbm6Eqhv3dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727515573; a=rsa-sha256; cv=none; b=ZeLUGj8/V8x7Iw6MHJ14bVVN/+4J+XFc+lrZtP/afDf+6aehONhOZ1RjL2rM8CWMl1HmYm lrE9OOvCoSbhx58dCl8huqjpFRy/PjfOoq3l3Z62BB8yATWbI4wgEqvyh0k7XwFoQ15SMH PNzTwOM3vcXjCIeIxcZ1gjWA4bOjEduSnJ3iCisuMCLSzAIQ9hZDPCJs2L21HI1NkiH7aO NZMaSzIm9FAc/46QYQRLKTnAJj52fZJMe7y3rhxUMjHYgztXsFeELUIIwKep5mSChsybeL j+eHQ14PIuViuBYfyPryLgnfN8XIY9o5Idsio6cSuyXGsQZppb/Q5T7pLiY18w== 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 4XG25K2nkxzK45; Sat, 28 Sep 2024 09:26:13 +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 48S9QDe8077280; Sat, 28 Sep 2024 09:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S9QDbD077277; Sat, 28 Sep 2024 09:26:13 GMT (envelope-from git) Date: Sat, 28 Sep 2024 09:26:13 GMT Message-Id: <202409280926.48S9QDbD077277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 76e57cf9ded8 - stable/13 - ixgbe: fix fw_recovery_mode callout List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 76e57cf9ded8df8263a7b0e5eac56840821a0634 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=76e57cf9ded8df8263a7b0e5eac56840821a0634 commit 76e57cf9ded8df8263a7b0e5eac56840821a0634 Author: Kevin Bowling AuthorDate: 2024-09-21 11:10:11 +0000 Commit: Kevin Bowling CommitDate: 2024-09-28 09:25:43 +0000 ixgbe: fix fw_recovery_mode callout Need to pass the softc in with the callout arg (cherry picked from commit a924b5ee6a1b4456b5bde979bb9e15d18726de4f) --- sys/dev/ixgbe/if_ix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 2af927996aca..23e378ba70c6 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -1151,7 +1151,7 @@ ixgbe_if_attach_post(if_ctx_t ctx) callout_init(&sc->fw_mode_timer, true); /* Start the task */ - callout_reset(&sc->fw_mode_timer, hz, ixgbe_fw_mode_timer, 0); + callout_reset(&sc->fw_mode_timer, hz, ixgbe_fw_mode_timer, sc); } return (0);