Diffusion FreeBSD src repository b0e38a1373c0

bridge: distinguish no vlan and vlan 1
b0e38a1373c0
Actions

Description

bridge: distinguish no vlan and vlan 1

The bridge treated no vlan tag as being equivalent to vlan ID 1, which
causes confusion if the bridge sees both untagged and vlan 1 tagged
traffic.

Use DOT1Q_VID_NULL when there's no tag, and fix up the lookup code by
using 'DOT1Q_VID_RSVD_IMPL' to mean 'any vlan', rather than vlan 0. Note
that we have to account for userspace expecting to use 0 as meaning 'any
vlan'.

PR: 270559
Suggested by: Zhenlei Huang <zlei@FreeBSD.org>
Reviewed by: philip, zlei
Differential Revision: https://reviews.freebsd.org/D39478

Details

Provenance

kp	Authored on Apr 7 2023, 4:00 PM

Reviewer

philip

Differential Revision

D39478: bridge: distinguish no vlan and vlan 1

Parents

rG9af6f4268ac3: bridge: Use the %D identifier to format MAC address

Branches

Unknown

Tags

Unknown

Event Timeline

kp committed rGb0e38a1373c0: bridge: distinguish no vlan and vlan 1 (authored by kp).Apr 14 2023, 11:17 AM

kp added an edge: D39478: bridge: distinguish no vlan and vlan 1.Apr 14 2023, 11:21 AM

kp mentioned this in rGfd7edfcdc3c3: bridge: fix lookup for untagged packets in bridge_transmit().Jun 1 2023, 9:40 AM

kp mentioned this in D42188: ifconfig: add static bridge addresses for vlan 0, not 1.Oct 13 2023, 12:37 PM

kp mentioned this in rG6ace92326f3c: ifconfig: add static bridge addresses for vlan 0, not 1.Oct 15 2023, 4:23 PM

kp mentioned this in rGce3ab9dfee30: ifconfig: add static bridge addresses for vlan 0, not 1.Oct 18 2023, 11:58 AM

kp mentioned this in rG1016db078351: ifconfig: add static bridge addresses for vlan 0, not 1.Oct 19 2023, 12:32 PM

Changes (2)

Path

Size

sys/

net/

if_bridge.c

if_vlan_var.h

rGb0e38a1373c0

View Options

sys/net/if_bridge.c