From nobody Tue Feb 14 15:36:18 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 4PGQKb0Sv5z3s5FD; Tue, 14 Feb 2023 15:36:19 +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 4PGQKb00Y8z4Kxc; Tue, 14 Feb 2023 15:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388979; 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=Unt8IKA1raQdCK1l0ZDc0sOmc5pKt9KxQ9FPJablz3U=; b=PmZcjW89NHdVUwsKF+qEOPfQbtpeo1Wu+RHts84PS/I9gcRGSbtG+t+5cps468NXevipd8 jSBX5xJ33eVY1kEc9ZfZbEhLUhGxLOIEEHIPmq744RB4OMk6jyl0rpyLqby1+yestnV9ik KTwo5H7JVoB5yJz7k3qOb5DE8JpK+y3buIgNfaaBypCfxnrpRlgKsfuGpY4g02x2eEiZUS tfdIwmVOCOqTafDhfiqHNhYvasE5+2znG8brTCT5MkUrAw8yKs8/GxMT2p2Z/Oof2y7izP 3TUIVV8ExVFrBS50lSWrCRM7VDTYG6jBY2JZqR/e1iv9WNYhhFIfnab7VGp/nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676388979; 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=Unt8IKA1raQdCK1l0ZDc0sOmc5pKt9KxQ9FPJablz3U=; b=gW/kyB4ntkzndIhaGo6fSG8vTCsEG5Lev6xoHxvwulcp4nbcm7GWSZu1IOo2iBjcYENP/I Mh8Dey3omFE8a6VJmvbKX69j6tY6SwFNVEA1m+0j8Eybz/9NRkfWNTrBtV5mgUxoLXIZ5X kQxcODSnHW41yNWUwewv5IeTe/l+TlzToJ1pKUINynlbFO4Y5m/0hRHmvNLwbPFT7kHvnu t8/g9+zZxjf9liZ029XdsjJyhZBQOzHi48E35fOZxJ9temQ/c4Qw8mqMzUksCQERtouh2T I/POz6WGcS577bwlg5rzsQulHop4ga17hNe2UB1hA9SENzTZejhAjSIyve9orw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676388979; a=rsa-sha256; cv=none; b=GuhFs1SS+UKUvULPFo8+RctvrqJ2Sq5h+94+7SEbPaLkI87bwTvpecV2Mqo2iIitbvQbV3 yAW5F0qqbRGs+ywdNqau4vy/65nhUB5FGBbuwMdvgb0KT+fdMKR+r0LCxjjgbu4ZII/+Xc orYlPBQYhl9OW2CIqB346D5cL5nZmHY1oa9t5dNjJXWG/GLYsJt4KCTXN6GuyXURodMvB/ U2U5QqW8RLm6uUpNKEfK48Nf9UnfZdHKnegs+A2o1ETk1AabLDZ6DicSMpQytCo0B23GBj Lbv84XloExl95ZlEo2Lm1vlYNWQlsaMj49imvTv+SKfj9q2RRW0ZvYDNzGtRPw== 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 4PGQKZ6D2Tz142S; Tue, 14 Feb 2023 15:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31EFaIWL043710; Tue, 14 Feb 2023 15:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EFaI9i043709; Tue, 14 Feb 2023 15:36:18 GMT (envelope-from git) Date: Tue, 14 Feb 2023 15:36:18 GMT Message-Id: <202302141536.31EFaI9i043709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 8d5feede40b4 - main - IfAPI: Finish changes of ice(4). 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d5feede40b489a6c0b2f2ee5258f8851ae6af88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5feede40b489a6c0b2f2ee5258f8851ae6af88 commit 8d5feede40b489a6c0b2f2ee5258f8851ae6af88 Author: Justin Hibbits AuthorDate: 2023-01-23 15:42:13 +0000 Commit: Justin Hibbits CommitDate: 2023-02-14 15:21:19 +0000 IfAPI: Finish changes of ice(4). Reviewed by: erj Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D38423 --- sys/dev/ice/ice_iflib_txrx.c | 2 +- sys/dev/ice/ice_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ice/ice_iflib_txrx.c b/sys/dev/ice/ice_iflib_txrx.c index f2ae62c77f7c..89c85357a755 100644 --- a/sys/dev/ice/ice_iflib_txrx.c +++ b/sys/dev/ice/ice_iflib_txrx.c @@ -419,7 +419,7 @@ ice_ift_queue_select(void *arg, struct mbuf *m, if_pkt_info_t pi) /* Included to match default iflib behavior */ /* Only go out on default queue if ALTQ is enabled */ struct ifnet *ifp = (struct ifnet *)iflib_get_ifp(sc->ctx); - if (ALTQ_IS_ENABLED(&ifp->if_snd)) + if (if_altq_is_enabled(ifp)) return (0); #endif diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index 43311ddf3f8e..da69145e85de 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -7514,7 +7514,7 @@ ice_link_up_msg(struct ice_softc *sc) int ice_update_laa_mac(struct ice_softc *sc) { - const u8 *lladdr = (const u8 *)IF_LLADDR(sc->ifp); + const u8 *lladdr = (const u8 *)if_getlladdr(sc->ifp); struct ice_hw *hw = &sc->hw; enum ice_status status;