Re: [PATCH net-next 1/4] net: bridge: Allow bridge master in br_vlan_get_info()
On 10/05/18 13:13, Ido Schimmel wrote: > From: Petr Machata > > Mirroring offload in mlxsw needs to check that a given VLAN is allowed > to ingress the bridge device. br_vlan_get_info() is the function that is > used for this, however currently it only supports bridge port devices. > Extend it to support bridge masters as well. > > Signed-off-by: Petr Machata > Signed-off-by: Ido Schimmel > --- > net/bridge/br_vlan.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c > index df37a5137c25..dc832c0934c6 100644 > --- a/net/bridge/br_vlan.c > +++ b/net/bridge/br_vlan.c > @@ -1176,6 +1176,8 @@ int br_vlan_get_info(const struct net_device *dev, u16 > vid, > p = br_port_get_check_rtnl(dev); > if (p) > vg = nbp_vlan_group(p); > + else if (netif_is_bridge_master(dev)) > + vg = br_vlan_group(netdev_priv(dev)); > else > return -EINVAL; > > Acked-by: Nikolay Aleksandrov
[PATCH net-next 1/4] net: bridge: Allow bridge master in br_vlan_get_info()
From: Petr Machata Mirroring offload in mlxsw needs to check that a given VLAN is allowed to ingress the bridge device. br_vlan_get_info() is the function that is used for this, however currently it only supports bridge port devices. Extend it to support bridge masters as well. Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- net/bridge/br_vlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index df37a5137c25..dc832c0934c6 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1176,6 +1176,8 @@ int br_vlan_get_info(const struct net_device *dev, u16 vid, p = br_port_get_check_rtnl(dev); if (p) vg = nbp_vlan_group(p); + else if (netif_is_bridge_master(dev)) + vg = br_vlan_group(netdev_priv(dev)); else return -EINVAL; -- 2.14.3
