From nobody Wed Oct 18 11:57:37 2023 X-Original-To: dev-commits-src-branches@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 4S9Tqj2yl2z4xvq5; Wed, 18 Oct 2023 11:57:37 +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 4S9Tqj2Llsz4V1L; Wed, 18 Oct 2023 11:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697630257; 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=s0ZKYu77f3B4CQjf5SX/hugi3hsMGU0StSThHl7T5JA=; b=CNhuQ1jk3qLIKWBrKeKzgDpkaCiycEkts+2dd6kyhMFVJjkCyT6lgu5MAxljCBrRPx98am c+iyyIKca4JUQe2ALWBh5KlsP3bDCrP+enEhO50YYU0uE9ndlQuBXblDotSNMP7DuYZqba xIDMleqboBsSEdz7njnxCrouTRLMaPRZjOeRwQADHqMygXVVYIzBjSeyfw9iQtGAJk0vBz fEeOz1GQc4GHRCeD20PCnOIPh3zkMX1PTzVGjk0Qmiz5QQJe1mLQxDamn+AISZLehBRUkP BKhbHEq22wirQBUqEn8QAIa7e1iGLGT56RWJWcckWC9w95is/QG1XrtNsLP+MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697630257; a=rsa-sha256; cv=none; b=eSD75mTAeC7oBQtBcDCA7KV2fcTXGUM1wpsQWLhGSZBgyjlTL8J+rflR/dZNZHq5lnn4+w UaRCi8Mic0hIK8cL4pkWHKNxatWlD/uqV2RX9d8SrDTzNh9vzsVPNbbLsCLPVvSzX3hWGi dLTgTVh3tjS+RhWiDijjBMzLaM5A4LN1uyw7WDUHUO6PL+K/Cu5WaGAnfiJbQxvzV7Gc+P VpncgxKJlONhkghy+6R3+RANKuzfgGy2VfUJlcrlfQzashVQJg1WUsS8qf8pQTU2CdlqSc d0iAxpdfMxrSMdedwiXo/R8gRIdmz/XAQBqhn+j2HLoyhkPC6D1WkC2by+mLew== 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=1697630257; 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=s0ZKYu77f3B4CQjf5SX/hugi3hsMGU0StSThHl7T5JA=; b=mr0gDrHndhI9gSjbh6GfUzbhRD3kENphWqNyazdaAM5DYr7KZh3ia+afXN/Cfz+EB3q0/o DquXxiRD9cUzdanAAuUpVxGW2lRcqm0d7BRNjhDeO0C/uOWY5ES2okegDtDeapkomztOUJ RACZstjz+RwsJSEbUeBvWKQSDsvLyf5tzzJvF0WyuxCCe2nkmQk7NFCtVflOxbTyfBgxC8 5js6+KOlg63LsOCZTpT32N3TSH1mWZxuekd5wTPsFAgDRKJvjuQEMz5+qvgGa7d1M31pr0 ll4O2uykNDqvoC03D0jVnXzh4tWPc3ThTM4ryi8m9QhWX9RDmAU7IOASsPUQOg== 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 4S9Tqj1QZyz15TN; Wed, 18 Oct 2023 11:57:37 +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 39IBvbSd024060; Wed, 18 Oct 2023 11:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IBvbCK024057; Wed, 18 Oct 2023 11:57:37 GMT (envelope-from git) Date: Wed, 18 Oct 2023 11:57:37 GMT Message-Id: <202310181157.39IBvbCK024057@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: ce3ab9dfee30 - stable/14 - ifconfig: add static bridge addresses for vlan 0, not 1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ce3ab9dfee304d335b4307c35e77407771d6cc3f Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce3ab9dfee304d335b4307c35e77407771d6cc3f commit ce3ab9dfee304d335b4307c35e77407771d6cc3f Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-18 06:43:40 +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 (cherry picked from commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2) --- 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);