| Message ID | 1378809571.3988.13.camel@ubuntu-vm-makita |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/10/2013 06:39 AM, Toshiaki Makita wrote: > We currently set the value that variable vid 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 <vyasevich@redhat.com> -vlad > --- > net/bridge/br_vlan.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c > index 5a9c44a..53f0990 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); > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 5a9c44a..53f0990 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);
We currently set the value that variable vid 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> --- net/bridge/br_vlan.c | 1 + 1 file changed, 1 insertion(+)