From nobody Mon Dec 15 16:57:30 2025 X-Original-To: dev-commits-src-main@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 4dVR7Z4j3Fz6L1Sr for ; Mon, 15 Dec 2025 16:57:30 +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 4dVR7Z2Xwcz3ngj for ; Mon, 15 Dec 2025 16:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765817850; 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=jZqu+QkdXyqpzYUCwVXeUj2Hq7ipFz+qe/uQjBAwQc8=; b=UvvVTrZmChyuR2mMZoUxs7GpqquykCetDKeJmI31NV4TgrO16ATrDCcCFwIRtxdTf0CEWg 76a7DM/idREQ7cg+ctR3zsIvwdeG2Fc6z2+DzI1CWCtjy4/H+OIDmEg9Oko1B9KgMQgRvn XGx6cPyVXVvMhRtOTqAMBMLamILZwmWF31xcm2wPdRQ4ZKMoskrjuMuJl3C2kYA0Kmo+pq ySBi5Tdc7hy0L/9A3VUKufqdEJMZwlcjAcyozyk7553h+Pl72y1ZN3DVp+reu+75tRyJPL j9ZQxCaZ5Ci7TIpTkiiEK1dqXstf9Gf1/4zMsjOIoJXPZUaEmTNla3H+F1D4Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765817850; 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=jZqu+QkdXyqpzYUCwVXeUj2Hq7ipFz+qe/uQjBAwQc8=; b=h8QwFxlF6CLtdxAcAmIblgCilhedH7zuDxBy5fN/qddwRGbR15xoy+emsQcfI/lu7r54uV ZSAsGHE9nrNiW8sE25j4/xrliGEE96oG1J7y4C6u+eO4C/3uKogITWZjhwjSAYkzlucxDp Va5Ps9ZqvPbh4yqScWex6mZoN3dudmZtO/mQJ6Jhhe6XELncduhRcjl64hU2KbfPwzdG5r P1JjAbuAKsuHSTmtYcCO4MrFxux3s26MVV03zgWaAkzQ5lLLc2x9FOPKrA0mwNatnhnry5 M0mzX56o8qoTJ9Xwf+qKuM40jA6UwUdJnwITo0fwdqoS9eztzP84bs2niLAfWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765817850; a=rsa-sha256; cv=none; b=pRErGkl8XsPTCQmQzmJ4+KY5eLE0zY/zpafEH0w4Ofxz9+1yOU6qw+OYHXIpyJS+qxRFxP pi5twOQV5DC5TBw4QjkJfAY3NksSBiBUT/b4Mdw0al/aH3qRBhwYpBguEsvXf4S7u3/6sp xddZDeCtX+/WH0r/8Dx+t3NmVML2NJBLPq+wYUVV14qIHWAorT68QpccCEzBrWHVx7abX7 yjJnDFErGn1VSxpuRT3LelyXWdCOezxcgA/N6HzgmLlMQ9gBZoY4oNZxEP7sPQn9w6L4PU 96kMuqTqMw6RJv42sBkKBMQjwCQzsl2IoNQ7zNN2ubRlZWMmz+Gig6+/HDKoMg== 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 4dVR7Z1KwyzC8h for ; Mon, 15 Dec 2025 16:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d7e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 16:57:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Seyed Pouria Mousavizadeh Tehrani From: Gleb Smirnoff Subject: git: ac6a7f621668 - main - if_clone: don't overwrite dump_nl of an attaching cloner with default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac6a7f62166878038b9f8bd38a3fb1ff99ee8918 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 16:57:30 +0000 Message-Id: <69403dfa.d7e0.19300d08@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6a7f62166878038b9f8bd38a3fb1ff99ee8918 commit ac6a7f62166878038b9f8bd38a3fb1ff99ee8918 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-12-15 16:53:47 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-15 16:53:47 +0000 if_clone: don't overwrite dump_nl of an attaching cloner with default Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D54190 --- sys/net/if_clone.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 066547ceeeb3..4bc04130da1e 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -535,11 +535,12 @@ ifc_attach_cloner(const char *name, struct if_clone_addreq *req) ifc->create_nl = req2->create_nl_f; ifc->modify_nl = req2->modify_nl_f; - ifc->dump_nl = req2->dump_nl_f; + if (req2->dump_nl_f != NULL) + ifc->dump_nl = req2->dump_nl_f; + else + ifc->dump_nl = ifc_dump_ifp_nl_default; } - ifc->dump_nl = ifc_dump_ifp_nl_default; - if (if_clone_attach(ifc) != 0) return (NULL);