From nobody Thu Oct 19 12:31:59 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 4SB6Xv4v88z4xP1Z; Thu, 19 Oct 2023 12:31:59 +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 4SB6Xv4Snnz4Hpt; Thu, 19 Oct 2023 12:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697718719; 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=L6dsKKULn1chbLU2FbxEXvmmRodMKTF502fN2pEML+E=; b=l9xzA+f0/LnR68MoL6lMoCrfsciNAJmqk6Tq3Ht9ykA8stbDWdiHuYP4Uq9PlR30in5fSm h1JvLY86pS3OznEQKGn1ZlRULXx1mK0QbVX3pGviZ21Xx9MDnUQnrM9Llt6DrZzkFRnJP9 qxO4QHOIa+hF3GQWLEgknY4rrSkvJszXbPGpxV1PaGkRscWCrbquB+5CL4M9OwXmLSkxBw F3KNvkjjHz6sZYRqUAfqFqfPnYWONiCe0ZLKe0f8+LyOlQH81EIvGsBxgYejW3tJ80ck6t +XHFnLPvduzSC2uQgW0Hod7cSsYxhvXFA5RyY+G3/mzpga4tl18ncb/rlglImg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697718719; a=rsa-sha256; cv=none; b=b24gsa8vN9IdPrYz3fIURvahTHIV/5dDQUSqH8TO6WzdVuzXCvDJ3cqERlTlRaw9VnUBxS WBOOI4ScrmQHyFKkeZoFH4n/FI1Qw7oTG6/8viLzZK+kvi1BbUE28FdFLcxy5aQtxnlGrk JzctalPhVqJRz8CQujmZZ9QhNEYNsau4OaByaxm9zNVZVzNSRpsjmXPOED4LFLMT9ZeMKZ 5Aa1OX5h3C5CW0rT2n8AK//TAcHLKNdGVuIXrVo83FtMvTKQUN7Zf/OZSwEkRgf4APGKVK y4NLgBC2zjJVPWZku39vP4kCaaAaIqNZMbo6MIfW4KG0Cs9Q+i8MddJLv9Yf8g== 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=1697718719; 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=L6dsKKULn1chbLU2FbxEXvmmRodMKTF502fN2pEML+E=; b=TBuSnba7SC2Mg09oUReiMZo83dxDxI6DZsCa26bKx7Zwx7yxoZvsAn21Pz+mSi9A+u8k19 DcRZHcdmQgOX5UxtV+1FiHHOY/IBJLLMlqger6mTvOeXzBibr7aVnple0XBg2WF7wqn3Fl Spr6lrqE1O29xF79L4YruWeTufp8hOZjeWig3bRj7NVOr6m7LsmPsiSAOkt1dtttkclx+Q ePntqlrDsTyPVw9lXM5IVdq6TEXdx2ePfJ4M+9KfmcYVN7Guk9EPwv/alJB5R00vPf7Tc8 fNapZhtqfO6OLnWakutrwfIMkE6x7RVUbXAQQ2TKUy2muj6nRKWL4mnBQhvVSg== 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 4SB6Xv3X5mzpym; Thu, 19 Oct 2023 12:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JCVx0q092661; Thu, 19 Oct 2023 12:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JCVx78092658; Thu, 19 Oct 2023 12:31:59 GMT (envelope-from git) Date: Thu, 19 Oct 2023 12:31:59 GMT Message-Id: <202310191231.39JCVx78092658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1016db078351 - releng/14.0 - ifconfig: add static bridge addresses for vlan 0, not 1 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1016db0783516d8ff11e1a1b580ef0799d6d9c87 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1016db0783516d8ff11e1a1b580ef0799d6d9c87 commit 1016db0783516d8ff11e1a1b580ef0799d6d9c87 Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 12:31:34 +0000 ifconfig: add static bridge addresses for vlan 0, not 1 Since fd7edfcdc3 ("bridge: fix lookup for untagged packets in bridge_transmit()") and b0e38a1373 ("bridge: distinguish no vlan and vlan 1") we do a better job of distinguishing between untagged and VLAN 1 traffic. However, ifconfig still defaulted to adding addresses for VLAN 1, rather than for untagged traffic. Change this to be the most common (i.e. untagged) option. Approved by: re (kib) Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 (cherry picked from commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2) (cherry picked from commit ce3ab9dfee304d335b4307c35e77407771d6cc3f) --- sbin/ifconfig/ifbridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 3a97a5af3931..57ab0c6ae81c 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -407,7 +407,7 @@ setbridge_static(if_ctx *ctx, const char *val, const char *mac) memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 1; /* XXX allow user to specify */ + req.ifba_vlan = 0; /* XXX allow user to specify */ if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) err(1, "BRDGSADDR %s", val);