From nobody Tue Jul 11 17:41:51 2023 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 4R0p8c1rrGz4mh4m; Tue, 11 Jul 2023 17:41:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0p8c1Qlyz44K9; Tue, 11 Jul 2023 17:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689097312; 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=w8sGb0A4jVtuua9uptfPBs0MybMikjuXz3VtJWBakFs=; b=bo9uXgMcPmsWxIWMwWyEE987ulP4HF9sCv9grXhknGjbrjWQb3U0oEHNFz/ObL1/4ZPZdL E4y/Y3+mqYs3gifcm+D3VFuJvfADd1/aPJS4Lagtfjg3mRo2/jnLA/lSIN4+HqWClf9ToH r52PaVGe68bvs5qVKdFDE00YoF12fh2Mc5yJKijToZDsChsl/IIGd0JuUXhOuos8BMv8tD C+QZOgZlzAHYhPhjsgrWFMtDnN6OqnBRLM/wxKCeejcI0Y18xBDRULb7wI9SNwB8cMLdcA 3JuDOpHCC524B8NiDRYIAaAlLZBfNc3lA91N3guK8mkn1lQEzHPQ6PScbshz8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689097312; 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=w8sGb0A4jVtuua9uptfPBs0MybMikjuXz3VtJWBakFs=; b=v33mxZHpCqxzl4aAEJskmAi7IApnuUlAkMwbWeO3IeG/VDLIqnD+YfU+EKyBYZ5D7bz30E Eg7wRJL2IBgB3nu7ym9SH4H7g+WDIkiMJS3sVrBbq1aXEvSK810XsXPhZ+3hCXpxOe7N8W jvKrlSQgup0eGy4t1N1S+ogzjWn12gBPLKkPFYy1QV/33y/Kyj/0Kj2t2RbGWB1/Rxvc+T 1N50jJ4MUZgA/+8N4b3qQ56MfEVJ61z2337u01F/7T5546bhSTjYilfZmK0SGzxbODUslt UUilHWSj3gJ/mgJNfwqkvlHqU8cMbHwCe3NLPwKIyAsyMADaXsWqMA7k602YLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689097312; a=rsa-sha256; cv=none; b=r2EApcfhtUKm94bex1Z3x6v4fHIajVi6HVjPVIMd5FVNCkMTAhuKq2o5/pMTppNaAiv10Z zOQlGz1CAh+Iz5IZ1Z9Yb5d/Hh2Qp7nxkLYFdXQC6GSqWd5HrziFnNCM/zoV3Vn3CzFzR0 KNghB+WwUWNajPMdTHZAM2r8jB9e7id55Zuy+hBb/lFnVSwY5uqiC57ImQ2d29GxDXtbsV uiw5cz78zONi+6vG+40D5iwl3i5s6lPmEguHag8usry7N9YXdKU+Laka0drKcKxxtDruVH CtZu2rluhxLCKbIU+9eSARjQo4BA++gCsgKx5pASR7y/hmvsJOKVxULMuSOHmw== 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 4R0p8c0VYxzZZ1; Tue, 11 Jul 2023 17:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BHfp9M067768; Tue, 11 Jul 2023 17:41:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BHfpsW067767; Tue, 11 Jul 2023 17:41:51 GMT (envelope-from git) Date: Tue, 11 Jul 2023 17:41:51 GMT Message-Id: <202307111741.36BHfpsW067767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5ddb1aa30563 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ddb1aa3056305c202e604dd456fe0dcf365edd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ddb1aa3056305c202e604dd456fe0dcf365edd7 commit 5ddb1aa3056305c202e604dd456fe0dcf365edd7 Author: Piotr Kubaj AuthorDate: 2023-07-11 17:41:26 +0000 Commit: Piotr Kubaj CommitDate: 2023-07-11 17:41:26 +0000 ix, ixv: fix kernel build struct adapter was renamed to struct sc. Reported by: FreeBSD User --- 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 45ab7c27233a..487a5625dd3a 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3679,7 +3679,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 13f48a6fd3ec..cf5c8f92c450 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -937,7 +937,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) {