From nobody Fri Aug 22 20:43:13 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 4c7sb568kSz64vl9; Fri, 22 Aug 2025 20:43:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7sb55fKlz4Qcy; Fri, 22 Aug 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895393; 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=FNXDya5yO1VhQUrhVABV/EwS6YUkiTbIHFl4mNKmb84=; b=Nq70V5AKBdX8Bw7VSQwB4gH7FNWN0pw/D3gQgHSWXRBDrG36VIr7CWnD+S2J0Oa3q0CiWP SLJQQdaMs5dJ8Xk0HxJAg/56PgiIkAP1z/gCkXY1HeH9p6BXS17Rh5cQbJQ5aBRIaxdnYj pAaWx/FTTrvKVV+h8nY6LvQLvyIAAD2hXSxtSl2jBvSKTyrYkl4P4q8+y6/JIJHt90XzLs ORsITAkYaHWc039D9bLBQh7RPljo/Huqenu//xY6NxM2dvneCTaVKetJ2SbCKNeU5EcjtP m8C0+GdF8jXp3iUnqRzYw1GA3CRJg/DGu/61XWkGrHXUOjYN8hIi+tuU+DnBfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755895393; 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=FNXDya5yO1VhQUrhVABV/EwS6YUkiTbIHFl4mNKmb84=; b=KOcMMXOn6O5eNrGRV1FpTHfXPNFkULIY1q8M4cQYe4RehG4UO1yXtMGhDvRMgxO4IkV9R0 r9aywTAO/Wos0bcRZJ4+dZWHG3mEczAAr43nov35+3BwQWJ8Gs9G5l89aItGyKOxHwAM6h yn2cGxt2LI2RtDau/JLNK0hDgh+iYbkn6cHnT2ty0eMeq+YzMje4oH4IW4y0G0XM2HbFu8 Ly5Qra5GLIx/iQjmw54KvpbtimgHbfxnnAQMfzSxACIb3114v4Aw8X6lNWKcljha/xPG/w nOzQcmTPcVfCE6GcKOR2gLLKP3zyn9Pvb1uc4BKoWg6Tyyj81ypCr+Z6Eyb/xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755895393; a=rsa-sha256; cv=none; b=aMs/62p74xdgGQ4F6dNtnYfhm+JtK6SHSh5sxdVRPz649jrukmXZLpk8gj05scmPlGwMhB YiIK1AGGlvlM/CXDbetMiHNbzG0xon7qw9Czo8KVZSapwKuDBd/havffhTIMxk+C01MswZ +QQuMWkTO8Fai8HNoJ00uQuO8VG8bPnBbeX2KC2aLogB3wxlHiPHSZ49zPkbJmSNt0WtKE BgV0Kp9pcGaYoQcaUHV6Wh3tgRLJi/kYsmU7TQHmRmHoaLZR+GY8cYpO0z5ufBli/5DXRF wUwmaNnC4yuLp2x7VkOHONVcHQj7XDbV8P5vWTEmiJzwjA0fRZnYIdYhtSUX7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7sb555Hfz1239; Fri, 22 Aug 2025 20:43:13 +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 57MKhDx2007716; Fri, 22 Aug 2025 20:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MKhD1F007713; Fri, 22 Aug 2025 20:43:13 GMT (envelope-from git) Date: Fri, 22 Aug 2025 20:43:13 GMT Message-Id: <202508222043.57MKhD1F007713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: b3b5781c1c0b - main - Revert "netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler" 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3b5781c1c0b730f9430983ce241c46dc50504f3 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b5781c1c0b730f9430983ce241c46dc50504f3 commit b3b5781c1c0b730f9430983ce241c46dc50504f3 Author: Aymeric Wibo AuthorDate: 2025-08-22 11:03:10 +0000 Commit: Aymeric Wibo CommitDate: 2025-08-22 20:43:09 +0000 Revert "netlink: Fix IFF_UP flag handling in RTM_NEWLINK's modify_link handler" This reverts commit 39dbadb7a410f3955540041848d669264266e552. This broke the `sys/netlink/test_rtnl_iface.py:TestRtNlIface::test_create_iface_attrs` testcase. PR: 288967 Reported by: guest-svmhdvn Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51871 --- sys/netlink/route/iface_drivers.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 5f605b05f7b8..4bf913d9c978 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -82,12 +82,9 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if ((lattrs->ifi_change & IFF_UP) != 0 || lattrs->ifi_change == 0) { - /* Request to up or down the interface */ - if (lattrs->ifi_flags & IFF_UP) - if_up(ifp); - else - if_down(ifp); + if ((lattrs->ifi_change & IFF_UP) && (lattrs->ifi_flags & IFF_UP) == 0) { + /* Request to down the interface */ + if_down(ifp); } if (lattrs->ifla_mtu > 0) { @@ -100,8 +97,7 @@ _nl_modify_ifp_generic(struct ifnet *ifp, struct nl_parsed_link *lattrs, } } - if ((lattrs->ifi_change & IFF_PROMISC) != 0 || - lattrs->ifi_change == 0) { + if (lattrs->ifi_change & IFF_PROMISC) { error = ifpromisc(ifp, lattrs->ifi_flags & IFF_PROMISC); if (error != 0) { nlmsg_report_err_msg(npt, "unable to set promisc");