Commit 635126b7 authored Sep 12, 2014 by Vlad Yasevich Committed by David S. Miller Sep 13, 2014

bridge: Allow clearing of pvid and untagged bitmap



Currently, it is possible to modify the vlan filter
configuration to add pvid or untagged support.
For example:
  bridge vlan add vid 10 dev eth0
  bridge vlan add vid 10 dev eth0 untagged pvid

The second statement will modify vlan 10 to
include untagged and pvid configuration.
However, it is currently impossible to go backwards
  bridge vlan add vid 10 dev eth0 untagged pvid
  bridge vlan add vid 10 dev eth0

Here nothing happens.  This patch correct this so
that any modifiers not supplied are removed from
the configuration.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 20adfa1a

net/bridge/br_vlan.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,9 +27,13 @@ static void __vlan_add_flags(struct net_port_vlans *v, u16 vid, u16 flags)
		{
		if (flags & BRIDGE_VLAN_INFO_PVID)
		__vlan_add_pvid(v, vid);
		else
		__vlan_delete_pvid(v, vid);

		if (flags & BRIDGE_VLAN_INFO_UNTAGGED)
		set_bit(vid, v->untagged_bitmap);
		else
		clear_bit(vid, v->untagged_bitmap);
		}

		static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)

Admin message