From nobody Wed Nov 27 02:14:29 2024 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 4XyjgV3MHhz5fN1s; Wed, 27 Nov 2024 02:14:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XyjgT63Fzz4gBv; Wed, 27 Nov 2024 02:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732673669; 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=EgJEUi85MSpRzn+qyUebtu+yN2zWytoT8MxiAqa6iKY=; b=HDXasSvIVdFaqage+C6xqHyM7gw7ReaaVaDr20Mh4cOeRK5ptatNCVHZPvcGnbXFSwrVWI UIMhSOC02iG+FvC3iCcU5y2F+GBy6e4ouULDeOZk/y0jGWzrnRL4svnniy2T3kpeKgmnNl TtbIERSs9Cye7KsxvqemI/li94KnNrKh6v9qnK+0ZVuEEDrm040OynyEgw1z43vmrOHstj J1YbtAUscd5D7Jk5a9PPcJ6FTG1qORvTyGrjgCxW5s/wH6lpFQgiLkaLA428V3m3kENrS8 pXEPDsfcZAd16cc/CC3j6QMW1H/ma39jYVRKkU047rGWO6VZkKJbG5WzKGow2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732673669; 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=EgJEUi85MSpRzn+qyUebtu+yN2zWytoT8MxiAqa6iKY=; b=OP6XoAfY/L2+5LgmCpeB0wf6ZRKX9iNyxC1ax1k+AEHZ7+0UfEXnTWbM62b7AfjJDEWfx7 AyJMtdVdSzb7MvAsCy7Qy/NOp2nmHa+vU/2mOFjkCyVTKLdiLLCxKh8fiXdmDzsVF3tYaP A6HKIuRx55IN/e2353wdU22aRnqJ7SIIQPnWBLcMBaoKSF9vZSYIdD2QITPm6n3mx79ibM S5SddosAVX+DP7QqXA41KOvYn1tVr1UqfFnGMlcrUuPI5ppAV0hEFeSkQsg7iWGvsDW6I1 g30srGO02cKY4hHq1d2w8ugOPFkUPyDIsQBUaEvUNOH5TzNYSgZhSMwwGmOw1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732673669; a=rsa-sha256; cv=none; b=gzfotPCs/lR01lSv1pig27KVAgrigSbOj/Z9DLMTX1kBWk31umjlwoUYel1wONRcpu0ilT C11OMcG1/aoXJSFLokNhi+8LPxnk1qaegS23rasMP4W9YlW7bigeqRxj4G3cp+OkCZjgn4 WC4Of9CADkuWVwTNGS+laRtrKAqRiHE0N+OTQDuhTsQ0O8sihPvxNOO1CL9bcmb2Vsw+4m yCHZAqhK2t5q2vC9vD5aeRnNoOh86cMZM6/SH3PFEORPzyKCyobho1wetaXnGvDvz4tLgy N0RB1IQhSyp342Eh0Kp+ijcjtekicI+0GWswBfqyGo8o6TMvVkjvHSBFEr2J+Q== 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 4XyjgT5ZCkzq5X; Wed, 27 Nov 2024 02:14:29 +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 4AR2EToC066977; Wed, 27 Nov 2024 02:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AR2ETGK066974; Wed, 27 Nov 2024 02:14:29 GMT (envelope-from git) Date: Wed, 27 Nov 2024 02:14:29 GMT Message-Id: <202411270214.4AR2ETGK066974@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: 57b82de88bc4 - stable/13 - ix, ixv: fix kernel build 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 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: 57b82de88bc4f758a198c397c5aec79769689436 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=57b82de88bc4f758a198c397c5aec79769689436 commit 57b82de88bc4f758a198c397c5aec79769689436 Author: Piotr Kubaj AuthorDate: 2023-07-11 17:41:26 +0000 Commit: Kevin Bowling CommitDate: 2024-11-27 01:17:10 +0000 ix, ixv: fix kernel build struct adapter was renamed to struct sc. Reported by: FreeBSD User (cherry picked from commit 5ddb1aa3056305c202e604dd456fe0dcf365edd7) --- sys/dev/ixgbe/if_ix.c | 2 +- sys/dev/ixgbe/if_ixv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 2fb1c289ada4..313f95c82713 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3880,7 +3880,7 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) /* Update DMA coalescing config */ ixgbe_config_dmac(sc); iflib_link_state_change(ctx, LINK_STATE_UP, - ixgbe_link_speed_to_baudrate(adapter->link_speed)); + ixgbe_link_speed_to_baudrate(sc->link_speed)); if (sc->feat_en & IXGBE_FEATURE_SRIOV) ixgbe_ping_all_vfs(sc); diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 6e97e50c1914..4812f5e7368c 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -941,7 +941,7 @@ ixv_if_update_admin_status(if_ctx_t ctx) "Full Duplex"); sc->link_active = true; iflib_link_state_change(ctx, LINK_STATE_UP, - ixgbe_link_speed_to_baudrate(adapter->link_speed)); + ixgbe_link_speed_to_baudrate(sc->link_speed)); } } else { /* Link down */ if (sc->link_active == true) {