aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2023-10-13 10:34:06 +0000
committerKristof Provost <kp@FreeBSD.org>2023-10-18 06:43:40 +0000
commitce3ab9dfee304d335b4307c35e77407771d6cc3f (patch)
tree4e795e165ae40e3e27a89767b9378cb300ab5c32
parent44e3ce37f2f849ca457e2d14fba132972f0bbe01 (diff)
downloadsrc-ce3ab9dfee304d335b4307c35e77407771d6cc3f.tar.gz
src-ce3ab9dfee304d335b4307c35e77407771d6cc3f.zip
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)
-rw-r--r--sbin/ifconfig/ifbridge.c2
1 files changed, 1 insertions, 1 deletions
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);