mlxsw: spectrum_switchdev: Use ops->vxlan_join() when adding VLAN to VxLAN device

Currently mlxsw_sp_switchdev_vxlan_vlan_add() always calls
mlxsw_sp_bridge_8021q_vxlan_join() because VLANs were only ever added to
a VLAN-filtering bridge, which is only 802.1q bridge.

This set adds support for VxLAN with 802.1ad bridge, so VLAN-filtering
bridge is not only 802.1q.

Call ops->vxlan_join(), so mlxsw_sp_bridge_802{1q, 1ad}_vxlan_join()
will be called according to bridge type.

This is needed to ensure that VxLAN with 802.1ad bridge will be vetoed
in Spectrum-1 with the next patch.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 051a77440afef8bbcd485654497a6c8c92efec97..73290f71eb9c33aa4edd694849ec4b1d67f5e6f4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -3320,8 +3320,8 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp,
        if (!fid) {
                if (!flag_untagged || !flag_pvid)
                        return 0;
-               return mlxsw_sp_bridge_8021q_vxlan_join(bridge_device,
-                                                       vxlan_dev, vid, extack);
+               return bridge_device->ops->vxlan_join(bridge_device, vxlan_dev,
+                                                     vid, extack);
        }
 
        /* Second case: FID is associated with the VNI and the VLAN associated
@@ -3360,16 +3360,14 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp,
        if (!flag_untagged)
                return 0;
 
-       err = mlxsw_sp_bridge_8021q_vxlan_join(bridge_device, vxlan_dev, vid,
-                                              extack);
+       err = bridge_device->ops->vxlan_join(bridge_device, vxlan_dev, vid, extack);
        if (err)
                goto err_vxlan_join;
 
        return 0;
 
 err_vxlan_join:
-       mlxsw_sp_bridge_8021q_vxlan_join(bridge_device, vxlan_dev, old_vid,
-                                        NULL);
+       bridge_device->ops->vxlan_join(bridge_device, vxlan_dev, old_vid, NULL);
        return err;
 }