path: root/net
diff options
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>2013-10-16 17:07:16 +0900
committerDavid S. Miller <davem@davemloft.net>2013-10-18 16:02:53 -0400
commitdfb5fa32c66496a53ec6a45302d902416b51ade2 (patch)
tree3db8a5398a20be4884b5fb753626331e43d35dc9 /net
parentd1c6c708c4da9d104e0b7c116654cb449bff9b5f (diff)
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>
Diffstat (limited to 'net')
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 5a9c44a0c30..53f0990eab5 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -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);