From: Petr Machata <petrm@mellanox.com>
Date: Thu, 10 May 2018 10:13:03 +0000 (+0300)
Subject: net: bridge: Allow bridge master in br_vlan_get_info()
X-Git-Tag: v4.18-rc1~114^2~271^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b18d79e733fd727378aea7927536fb270c7ccbc;p=thirdparty%2Fkernel%2Flinux.git

net: bridge: Allow bridge master in br_vlan_get_info()

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 <petrm@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index df37a5137c254..dc832c0934c6c 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;