vlan: support binding link state to vlan member bridge ports (8c8b3458) · Commits · 戴 / test

In the case of vlan filtering on bridges, the bridge may also have the corresponding vlan devices as upper devices. Currently the link state of vlan devices is transferred from the lower device. So this is up if the bridge is in admin up state and there is at least one bridge port that is up, regardless of the vlan that the port is a member of. The link state of the vlan device may need to track only the state of the subset of ports that are also members of the corresponding vlan, rather than that of all ports. Add a flag to specify a vlan bridge binding mode, by which the link state is no longer automatically transferred from the lower device, but is instead determined by the bridge ports that are members of the vlan. Signed-off-by:

Mike Manning <mmanning@vyatta.att-mail.com> Acked-by:

Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/uapi/linux/if_vlan.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ enum vlan_flags {
		VLAN_FLAG_GVRP = 0x2,
		VLAN_FLAG_LOOSE_BINDING = 0x4,
		VLAN_FLAG_MVRP = 0x8,
		VLAN_FLAG_BRIDGE_BINDING = 0x10,
		};

		enum vlan_name_types {

net/8021q/vlan_dev.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,8 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
		u32 old_flags = vlan->flags;

		if (mask & ~(VLAN_FLAG_REORDER_HDR \| VLAN_FLAG_GVRP \|
		VLAN_FLAG_LOOSE_BINDING \| VLAN_FLAG_MVRP))
		VLAN_FLAG_LOOSE_BINDING \| VLAN_FLAG_MVRP \|
		VLAN_FLAG_BRIDGE_BINDING))
		return -EINVAL;

		vlan->flags = (old_flags & ~mask) \| (flags & mask);

net/8021q/vlan_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ static int vlan_validate(struct nlattr tb[], struct nlattr data[],
		flags = nla_data(data[IFLA_VLAN_FLAGS]);
		if ((flags->flags & flags->mask) &
		~(VLAN_FLAG_REORDER_HDR \| VLAN_FLAG_GVRP \|
		VLAN_FLAG_LOOSE_BINDING \| VLAN_FLAG_MVRP)) {
		VLAN_FLAG_LOOSE_BINDING \| VLAN_FLAG_MVRP \|
		VLAN_FLAG_BRIDGE_BINDING)) {
		NL_SET_ERR_MSG_MOD(extack, "Invalid VLAN flags");
		return -EINVAL;
		}

Admin message