hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Toshiaki Makita 2013-10-16 17:07:16 +09:00 committed by David S. Miller
parent d1c6c708c4
commit dfb5fa32c6
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/bridge/br_vlan.c
View File

@ -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 /* PVID is set on this port. Any untagged or priority-tagged
* ingress frame is considered to belong to this vlan. * ingress frame is considered to belong to this vlan.
*/ */
*vid = pvid;
if (likely(err)) if (likely(err))
/* Untagged Frame. */ /* Untagged Frame. */
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid); __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);