Commit dfb5fa32 authored Oct 16, 2013 by Toshiaki Makita Committed by David S. Miller Oct 18, 2013

bridge: Fix updating FDB entries when the PVID is applied



We currently set the value that variable vid is pointing, which will be
used in FDB later, to 0 at br_allowed_ingress() when we receive untagged
or priority-tagged frames, even though the PVID is valid.
This leads to FDB updates in such a wrong way that they are learned with
VID 0.
Update the value to that of PVID if the PVID is applied.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Reviewed-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d1c6c708

net/bridge/br_vlan.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,7 @@ bool br_allowed_ingress(struct net_bridge br, struct net_port_vlans v,
		/* PVID is set on this port. Any untagged or priority-tagged
		* ingress frame is considered to belong to this vlan.
		*/
		*vid = pvid;
		if (likely(err))
		/* Untagged Frame. */
		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);