mlxsw: Save EtherType as part of mlxsw_sp_nve_params

Add EtherType field to mlxsw_sp_nve_params struct.
Set it when VxLAN device is added to bridge device.

This field is needed to configure which EtherType will be used when
VLAN is pushed at ingress of the tunnel port.

Use ETH_P_8021Q for tunnel port enslaved to 802.1d and 802.1q bridges.

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.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 6092243a69cbe5727667f6f75e58feb7d1ffe7b1..7e728a8a9fb36ded4109b7afd85ed63f3bfc6199 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -1202,6 +1202,7 @@ struct mlxsw_sp_nve_params {
        enum mlxsw_sp_nve_type type;
        __be32 vni;
        const struct net_device *dev;
+       u16 ethertype;
 };
 
 extern const struct mlxsw_sp_nve_ops *mlxsw_sp1_nve_ops_arr[];

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index c53e0ab9f97113edfce3b7b01346a2bac756e5d6..051a77440afef8bbcd485654497a6c8c92efec97 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -2055,7 +2055,8 @@ mlxsw_sp_bridge_8021q_port_leave(struct mlxsw_sp_bridge_device *bridge_device,
 static int
 mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
                                      const struct net_device *vxlan_dev,
-                                     u16 vid, struct netlink_ext_ack *extack)
+                                     u16 vid, u16 ethertype,
+                                     struct netlink_ext_ack *extack)
 {
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(bridge_device->dev);
        struct vxlan_dev *vxlan = netdev_priv(vxlan_dev);
@@ -2063,6 +2064,7 @@ mlxsw_sp_bridge_vlan_aware_vxlan_join(struct mlxsw_sp_bridge_device *bridge_devi
                .type = MLXSW_SP_NVE_TYPE_VXLAN,
                .vni = vxlan->cfg.vni,
                .dev = vxlan_dev,
+               .ethertype = ethertype,
        };
        struct mlxsw_sp_fid *fid;
        int err;
@@ -2107,7 +2109,7 @@ mlxsw_sp_bridge_8021q_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
                                 struct netlink_ext_ack *extack)
 {
        return mlxsw_sp_bridge_vlan_aware_vxlan_join(bridge_device, vxlan_dev,
-                                                    vid, extack);
+                                                    vid, ETH_P_8021Q, extack);
 }
 
 static struct net_device *
@@ -2240,6 +2242,7 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
                .type = MLXSW_SP_NVE_TYPE_VXLAN,
                .vni = vxlan->cfg.vni,
                .dev = vxlan_dev,
+               .ethertype = ETH_P_8021Q,
        };
        struct mlxsw_sp_fid *fid;
        int err;