From nobody Sun Oct 15 16:23:20 2023 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 4S7lsj2bsJz4x7cl; Sun, 15 Oct 2023 16:23:21 +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 4S7lsj1bT7z4QG7; Sun, 15 Oct 2023 16:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697387001; 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=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=TYtEKFSAA0UaEDwR/Wm1/O12dq0V4wm09eCs49fMFanmX9gyGxa6UjmWIJ/fDR4I6Wk3lJ vwBkHB3+YBZVLfAVTSfIWCK9bSI8+o8gKnMIWTcZ7ZKhtX20SE+fGO4e3AHBsuB66VfUCs q/c1tlPS5LA7EmMnjFDFLyGtF6IG0gl83v5CDaYXjN/fX+tsU2GVEi+7F8N1ApSuiythfD ivn5G1DZZgPdPXlDYkCJ5szEoGE/fBVjghOa6dqAAu4EXpg5xH+MTuE2S5F2DNaIclyHAZ 5+u7Qn+ASYlwieIAmH+uCCZR2tTHsJDgC0ePAy7T4W7SzwLgNVz4ucTxsRrEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697387001; a=rsa-sha256; cv=none; b=rZFPV5/WTO+MqGJDgJumnUlRucK89w/VlohTVrGytLVFyeqKdFpHWW4cIEExs4tiXw+mPm BO8sTwh0ubrwS245guzKHeO4QS4BaluMQyoVMoBKt65BXDLlLYEM+FGBYIs56vyMjkD0FY niLkwdRGxepJskioyYWi2QlF2OfNxd0liV9YvKtQbfC57utuymyyGyG4HN/TEdI5LM+q2Q o9r/Ht9IdgJe7gdiD/s7dm8ZaMGwHLEAeOyARxbnfkfbLWYfxaBVYM0LJlkXm/Ph5Luu27 8NHT4KVNTfm0OXid5lXlYgQUZ+cI5CXamiL8Wxlbf9pdnmGCDdUorUHuWCr4Kg== 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=1697387001; 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=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=uAXRoJtMhr4+a0M61bhXzfKsEikFKg3gTBJn4xqp0gqV0T1oby2qmThHM8FhVSuy8QN+Jr FLtgmybsiZb/hgSO9ugzURbTwTSadVEcUMPuzd3uV0jiEfgssb8W1UozGC0LkUpidXYaxC by1XPYvDshV0PeBPprH3G6ofcMQYbI/znTQ5cInJHlpSjhqr5R2dTpWybMviCyWuPiTlOa kLa28J9L1LMigAvPXFJYGvfUj+FAYz77RkU/9WROFwuKQPwk1HkkWuUQzWj7qv/KgmTCCL aqQ1jUUW1EBt7ryhKjlXBW197uS5HAbzU9pgGPsym94ynqUowgK5vuvGdRBSyg== 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 4S7lsj0fCfz1J1D; Sun, 15 Oct 2023 16:23:21 +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 39FGNKvo075822; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FGNKhO075819; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 16:23:20 GMT Message-Id: <202310151623.39FGNKhO075819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6ace92326f3c - main - ifconfig: add static bridge addresses for vlan 0, not 1 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ace92326f3cc4bbee9b74f6b656cb13699a78a2 commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-15 14:21:53 +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. Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 --- 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 9b499b404946..2d0af1255a73 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -402,7 +402,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);