git: ce3ab9dfee30 - stable/14 - ifconfig: add static bridge addresses for vlan 0, not 1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Oct 2023 11:57:37 UTC
The branch stable/14 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=ce3ab9dfee304d335b4307c35e77407771d6cc3f
commit ce3ab9dfee304d335b4307c35e77407771d6cc3f
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-10-13 10:34:06 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
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);