From nobody Sat Feb 15 20:44:06 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 4YwLVt6213z5nKlJ; Sat, 15 Feb 2025 20:44:06 +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 4YwLVt1JZDz4Njg; Sat, 15 Feb 2025 20:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739652246; 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=MwMVJ5IyuR7byCc/mHxkb0oafAGcSrZ/YY2ZjTypGu0=; b=mdeRqlUMzaSdVW/Fsn4t8wXMLmoFt+f/lC1uSylHA86BLvOdG7kTu8Me8JEMHq82G2xLBT TuLMVc8ctYpexYPX2WYEp5SJh8iKdAOq/SXVyU8mEVdPr7OZI90tuCv83hs1oSjvxF2jYg 0zZLj5XARtwqgF1lm9YWRljuHRrkgXJqN0HFl1BKZuMfeTPsFo080dbx4Sc0X5Cl32+ePW hJXmzlVCSwcW7DtvSOBVeNqEubdmLk3lRnuexipklOEVNHihW/uTiV8Wi43Db6vDevBxi3 JNqEOv0f+baZZfIgjrHT8b02HC31rsfKbsJ+hEovefL8ZY2Kv6qQeDIfPCsAMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739652246; a=rsa-sha256; cv=none; b=CpQa0tjfMmBX7F6XA2fFvLo2hT19A5WxyU8PhpWZfLWf2RgHWuBMUzlcY4jpLEpIXaLPxY y88y/DQxgacqT6z+llKWqBxfcvSrypiVZmi+5jQg7eo5saX4ud9icvB8hXXZ2DVaHu17JT GVxb1ruMygvfSlTCDv58FPUYHtjw2eEPB1IowZtzsd+JiiKlzQSUOt1dQcZvdtm3E7sMNx 2CzSbRAKOuXOWvwYes82/Y82tGT3gjJ7T41iD64woqkjmXLdfW1fK/ZK8QlscH3YS4I4Dj 4hubQ0137R3rzjDP0sozGuLZLC8IHKshibxrL8lLNQ/QdXprHfypCzck1ALs1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739652246; 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=MwMVJ5IyuR7byCc/mHxkb0oafAGcSrZ/YY2ZjTypGu0=; b=mJS9xG0P8afiS4VyoQ+iIh9E5VusWGMX95cGBJDcErN/uCNKyqtWvz8og6YgiAp6eHQyLL x/Ras+AO7eRBo6UX56gvDi1uJqbKAo8U98dNIxxITv8tUYLyeY2r6MkY+2g0dDKm2zPthj Z6BrN12j5qKDAJOkU420iNgQk975U0IGwzSgqQmuJT2xTmkYzpmgeXyZ9yIyONDzAQtOyf jE4mkbes7HwEm1JK/Q3FlAeuTROr3E9zqOTTjfIbiD1W4+f5Jwsb0RW8Xi9SSJZDJtmZta Jn1ywkrgHTAEXjyfIx8nCh1kA18Pkmx5SkfM3AxSeZO111xURm0Xlf5prDgDfg== 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 4YwLVt0nWXz2Ch; Sat, 15 Feb 2025 20:44:06 +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 51FKi68a001000; Sat, 15 Feb 2025 20:44:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FKi66c000997; Sat, 15 Feb 2025 20:44:06 GMT (envelope-from git) Date: Sat, 15 Feb 2025 20:44:06 GMT Message-Id: <202502152044.51FKi66c000997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 0f10a33fc1b3 - main - ar40xx: fix to compile/run under the new ifnet rules 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f10a33fc1b30b2eefd7f0278380875b2982e9a9 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=0f10a33fc1b30b2eefd7f0278380875b2982e9a9 commit 0f10a33fc1b30b2eefd7f0278380875b2982e9a9 Author: Adrian Chadd AuthorDate: 2025-02-02 22:17:03 +0000 Commit: Adrian Chadd CommitDate: 2025-02-15 20:43:42 +0000 ar40xx: fix to compile/run under the new ifnet rules Locally tested: * IPQ4018, Asus router, w/ ethernet driver Differential Revision: https://reviews.freebsd.org/D49025 Reviewed by: imp, zlei --- sys/dev/etherswitch/ar40xx/ar40xx_phy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c index f27e7503eb28..aa02ef25ac7b 100644 --- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c +++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c @@ -200,9 +200,9 @@ ar40xx_attach_phys(struct ar40xx_softc *sc) snprintf(name, IFNAMSIZ, "%sport", device_get_nameunit(sc->sc_dev)); for (phy = 0; phy < AR40XX_NUM_PHYS; phy++) { sc->sc_phys.ifp[phy] = if_alloc(IFT_ETHER); - sc->sc_phys.ifp[phy]->if_softc = sc; - sc->sc_phys.ifp[phy]->if_flags |= IFF_UP | IFF_BROADCAST | - IFF_DRV_RUNNING | IFF_SIMPLEX; + if_setsoftc(sc->sc_phys.ifp[phy], sc); + if_setflagbits(sc->sc_phys.ifp[phy], IFF_UP | IFF_BROADCAST | + IFF_DRV_RUNNING | IFF_SIMPLEX, 0); sc->sc_phys.ifname[phy] = malloc(strlen(name)+1, M_DEVBUF, M_WAITOK); bcopy(name, sc->sc_phys.ifname[phy], strlen(name)+1); @@ -215,7 +215,7 @@ ar40xx_attach_phys(struct ar40xx_softc *sc) device_printf(sc->sc_dev, "%s attached to pseudo interface %s\n", device_get_nameunit(sc->sc_phys.miibus[phy]), - sc->sc_phys.ifp[phy]->if_xname); + if_name(sc->sc_phys.ifp[phy])); if (err != 0) { device_printf(sc->sc_dev, "attaching PHY %d failed\n",