From nobody Fri Dec 26 09:30:43 2025 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 4dd0j01MMTz6LHkK for ; Fri, 26 Dec 2025 09:30:44 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0j000MXz3MCm for ; Fri, 26 Dec 2025 09:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6uFjCBCHNk63/bv1oFpyt+D4Vq6hmOKakOwVdSJgg4=; b=s13SwhYgU3F0At49xFnAw+Wa0tes0oFUmBydJlhntJSSTCr3dRypZ63Cjg8TNdrUMxDFWf Tg/ic6uUkL2rDgqyRZABMjEC5iMw1mqsLtVhMh26B33/xWXtwS9Zo9nWIebM8fe2xG7cr8 EdF6WhXr3+GIr3W9+EkQlUdT2mGhYrq7oSljHpf4jIs4FDBXApOTLUwgtKJD6Yd6xBtiFC WS70uQz8bymooTk3ZU4PLAzk9tfkIPsuIX1CfiN8EMsKWqu+khSYfFlL+v+XadqILqh+s8 Ao+us4WXRbuYhBQwQYDfAo6gegsVqTvIWsbX+j8S6cjHeai8LbTIHbwViR6Nnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6uFjCBCHNk63/bv1oFpyt+D4Vq6hmOKakOwVdSJgg4=; b=X3L4kw8IxG5EhlBfyhW/SEQb3Xv1aVvZRIZhCC6oCrwO1NPUHdSaRplYqvdoR2cjMeYFvd hDc2u4JHB/dQBHxMX+gOEIfGXr7ThciNRnLvFh/TBD2qc++HB8tu4+Dk3c531WPX1lP2Ce EhoOQApZ8xKEZEahK7C6XPXKp36j2wbC9NX2Nd6HgR9Mq8ITZT/4DL6JBMqvvX24nY5Q3U aqGsdnj94Npm5qsGqKzJmh8vGugYwXQgFsPRCxiRsQriOg2/wopPtASms4q3sT7nrsF7GZ LybgxbR7L3OvY39kjv1SeqnA6SWFgs/T8QNCkeJjSBlQzSLoWRyNkmD2nRPG6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741444; a=rsa-sha256; cv=none; b=Ldi4rXBSlakiDwKvZrVZ1ZGk8BFZJrBSZ75GQVSU5CtNS45O2cYrpoqAbAnUEthLFc/G7s /d37kvGuyfvze7arHstlYNzc8exO5OwLG7GugA/UHIeRFz3dgkfXvSxo8ePZ4a5c8eQkfL 40n+ytiMfvUefkJOpNDjhjRX01rKIRnQGfH2vgVWxwLQYnLsS9YCoQeOoD8mpm/6DbuCi+ WNRXoqpVvQAWWL7jNR8UeLKbhb1EDEXZvJfVJePf+Uh7Q9BBblFhhJTssQKh+cZbq9FR7E 6A1Qx3J4euEGhkWG3aW/7vloWG/0W5XPKQsolFTBZiKlBGNt5QCwhjJ1fqJsvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hz6YL0z16nV for ; Fri, 26 Dec 2025 09:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f64c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: 16d50efd575e - stable/14 - qlnx: Convert recent changes to IfAPI 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 16d50efd575e288b608ae2e8f50d908f39704ac7 Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:43 +0000 Message-Id: <694e55c3.3f64c.43ab25ba@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=16d50efd575e288b608ae2e8f50d908f39704ac7 commit 16d50efd575e288b608ae2e8f50d908f39704ac7 Author: Justin Hibbits AuthorDate: 2024-11-08 20:22:11 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 qlnx: Convert recent changes to IfAPI Sponsored by: Juniper Networks, Inc. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D47533 (cherry picked from commit 1eaecc214ea2bfde84f4194c1d0e20b18117343f) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 32b893480401..9963f472c615 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2622,6 +2622,7 @@ static int qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) { int ret = 0, mask; + int flags; struct ifreq *ifr = (struct ifreq *)data; #ifdef INET struct ifaddr *ifa = (struct ifaddr *)data; @@ -2675,15 +2676,16 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) QL_DPRINT4(ha, "SIOCSIFFLAGS (0x%lx)\n", cmd); QLNX_LOCK(ha); + flags = if_getflags(ifp); - if (if_getflags(ifp) & IFF_UP) { + if (flags & IFF_UP) { if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { - if ((if_getflags(ifp) ^ ha->if_flags) & + if ((flags ^ ha->if_flags) & IFF_PROMISC) { - ret = qlnx_set_promisc(ha, ifp->if_flags & IFF_PROMISC); + ret = qlnx_set_promisc(ha, flags & IFF_PROMISC); } else if ((if_getflags(ifp) ^ ha->if_flags) & IFF_ALLMULTI) { - ret = qlnx_set_allmulti(ha, ifp->if_flags & IFF_ALLMULTI); + ret = qlnx_set_allmulti(ha, flags & IFF_ALLMULTI); } } else { ha->max_frame_size = if_getmtu(ifp) + @@ -7055,12 +7057,14 @@ qlnx_set_rx_mode(qlnx_host_t *ha) { int rc = 0; uint8_t filter; - const struct ifnet *ifp = ha->ifp; + const if_t ifp = ha->ifp; + const struct ifaddr *ifa; struct sockaddr_dl *sdl; - if (ifp->if_type == IFT_ETHER && ifp->if_addr != NULL && - ifp->if_addr->ifa_addr != NULL) { - sdl = (struct sockaddr_dl *) ifp->if_addr->ifa_addr; + ifa = if_getifaddr(ifp); + if (if_gettype(ifp) == IFT_ETHER && ifa != NULL && + ifa->ifa_addr != NULL) { + sdl = (struct sockaddr_dl *) ifa->ifa_addr; rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, LLADDR(sdl)); } else { @@ -7077,10 +7081,10 @@ qlnx_set_rx_mode(qlnx_host_t *ha) ECORE_ACCEPT_MCAST_MATCHED | ECORE_ACCEPT_BCAST; - if (qlnx_vf_device(ha) == 0 || (ha->ifp->if_flags & IFF_PROMISC)) { + if (qlnx_vf_device(ha) == 0 || (if_getflags(ha->ifp) & IFF_PROMISC)) { filter |= ECORE_ACCEPT_UCAST_UNMATCHED; filter |= ECORE_ACCEPT_MCAST_UNMATCHED; - } else if (ha->ifp->if_flags & IFF_ALLMULTI) { + } else if (if_getflags(ha->ifp) & IFF_ALLMULTI) { filter |= ECORE_ACCEPT_MCAST_UNMATCHED; } ha->filter = filter;