Differential D51600

bridge: Add a vlanfilter bridge option
ClosedPublic
Actions

Authored by ivy on Mon, Jul 28, 6:04 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Tue, Aug 5, 1:09 PM

	Unknown Object (File)
	Sun, Aug 3, 11:13 PM

	Unknown Object (File)
	Tue, Jul 29, 7:22 AM

	Unknown Object (File)
	Tue, Jul 29, 12:28 AM

	Unknown Object (File)
	Mon, Jul 28, 11:38 PM

	Unknown Object (File)
	Mon, Jul 28, 11:37 PM

	Unknown Object (File)
	Mon, Jul 28, 10:04 PM

Subscribers

Details

Reviewers

des
zlei
markj
kp

Group Reviewers

network
bridge

Commits

rGce06c1921e0c: bridge: Add a vlanfilter bridge option

Summary

vlanfilter was originally a per-interface flag to allow more flexible
configurations where some interfaces had VLAN filtering enabled and
some didn't. In practice, this just makes the configuration more
confusing without any real benefit, so remove it, and make vlanfilter
a bridge flag instead.

Add a new bridge option "defuntagged", which sets the automatically
assigned PVID for new members. If set to 0 (the default) then no
PVID is assigned, which matches the current behaviour.

While here, add some more atf_checks to the bridge VLAN tests to
make debugging easier.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ivy created this revision.Mon, Jul 28, 6:04 PM

Herald added subscribers: ziaee, glebius, melifaro and 2 others. · View Herald TranscriptMon, Jul 28, 6:04 PM

ivy requested review of this revision.Mon, Jul 28, 6:04 PM

Harbormaster completed remote builds in B65812: Diff 159351.Mon, Jul 28, 6:04 PM

this is a combination of D51176 and D51228, rebased on main so we can land it before code slush and avoid breaking the user interface in 16.0.

ivy mentioned this in D51185: bridge.4: Improve VLAN documentation.Fri, Aug 1, 3:22 PM

rebase on main, use get_vlan_id() in ifconfig.

add a test for defuntagged.

Harbormaster completed remote builds in B65909: Diff 159607.Fri, Aug 1, 10:50 PM

ivy added a reviewer: bridge.Sun, Aug 3, 10:25 PM

This revision was not accepted when it landed; it landed in state Needs Review.Sun, Aug 3, 11:13 PM

Closed by commit rGce06c1921e0c: bridge: Add a vlanfilter bridge option (authored by ivy). · Explain Why

This revision was automatically updated to reflect the committed changes.

ivy added a commit: rGce06c1921e0c: bridge: Add a vlanfilter bridge option.

Revision Contents
Changeset List

Path

Size

lib/

libifconfig/

2 lines

libifconfig_bridge.c

12 lines

sbin/

ifconfig/

80 lines

33 lines

share/

man/

man4/

4 lines

sys/

net/

84 lines

21 lines

tests/

sys/

net/

if_bridge_test.sh

161 lines

Diff 159698

lib/libifconfig/libifconfig.h

Loading...

lib/libifconfig/libifconfig_bridge.c

Loading...

sbin/ifconfig/ifbridge.c

Loading...

sbin/ifconfig/ifconfig.8

Loading...

share/man/man4/bridge.4

Loading...

sys/net/if_bridge.c

Loading...

sys/net/if_bridgevar.h

Loading...

tests/sys/net/if_bridge_test.sh

Loading...