mlxsw: spectrum_router: Allocate FID according to PVID

For bridge netdevices, instead of assuming that the router traffic is on
VLAN 1, look at the bridge PVID.

This patch assumes that the PVID doesn't change after the router
interface is created (i.e. after the IP address is assigned).

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 05c52e486330cc9d1b563084af1515ed2fb230f9..c7243d3f91dfdbb64845a17a683b7360151eeec0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -6870,7 +6870,20 @@ static struct mlxsw_sp_fid *
 mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,
                          struct netlink_ext_ack *extack)
 {
-       u16 vid = is_vlan_dev(rif->dev) ? vlan_dev_vlan_id(rif->dev) : 1;
+       u16 vid;
+       int err;
+
+       if (is_vlan_dev(rif->dev)) {
+               vid = vlan_dev_vlan_id(rif->dev);
+       } else {
+               err = br_vlan_get_pvid(rif->dev, &vid);
+               if (!vid)
+                       err = -EINVAL;
+               if (err) {
+                       NL_SET_ERR_MSG_MOD(extack, "Couldn't determine bridge PVID");
+                       return ERR_PTR(err);
+               }
+       }
 
        return mlxsw_sp_fid_8021q_get(rif->mlxsw_sp, vid);
 }