mlx5: Fix merge errors.

I accidently let Arnd's VXLAN dependency changes slip into net-next,
they are only appropriate for net.

Also the flow steering structural changes to mlx5e_priv got scrambled
during the merge resolution as well.

Fix that all up.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 2 insertions, 24 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index f5c3b9465d8d..1cf722eba607 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@ -31,10 +31,3 @@ config MLX5_CORE_EN_DCB
           This flag is depended on the kernel's DCB support.
 
           If unsure, set to Y
-
-config MLX5_CORE_EN_VXLAN
-        bool "VXLAN offloads Support"
-        default y
-        depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m)
-        ---help---
-          Say Y here if you want to use VXLAN offloads in the driver.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index e4a5b37b90ab..b531d4f3c00b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -6,7 +6,6 @@ mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \
 
 mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \
                 en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \
-                en_txrx.o en_clock.o en_tc.o en_arfs.o
+                en_txrx.o en_clock.o vxlan.o en_tc.o en_arfs.o
 
-mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o
 mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 7aea32e085b3..bfa5daaaf5aa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -522,12 +522,7 @@ struct mlx5e_priv {
         struct mlx5e_direct_tir    direct_tir[MLX5E_MAX_NUM_CHANNELS];
 
         struct mlx5e_flow_steering fs;
-        struct mlx5e_flow_tables   fts;
-        struct mlx5e_eth_addr_db   eth_addr;
-        struct mlx5e_vlan_db       vlan;
-#ifdef CONFIG_MLX5_CORE_EN_VXLAN
         struct mlx5e_vxlan_db      vxlan;
-#endif
 
         struct mlx5e_params        params;
         struct workqueue_struct    *wq;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index b60a1bc6f457..1c70e518b5c5 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2509,7 +2509,6 @@ static int mlx5e_get_vf_stats(struct net_device *dev,
                                             vf_stats);
 }
 
-#if IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN)
 static void mlx5e_add_vxlan_port(struct net_device *netdev,
                                  sa_family_t sa_family, __be16 port)
 {
@@ -2581,7 +2580,6 @@ static netdev_features_t mlx5e_features_check(struct sk_buff *skb,
 
         return features;
 }
-#endif
 
 static const struct net_device_ops mlx5e_netdev_ops_basic = {
         .ndo_open                = mlx5e_open,
@@ -2616,7 +2614,6 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = {
         .ndo_set_features        = mlx5e_set_features,
         .ndo_change_mtu          = mlx5e_change_mtu,
         .ndo_do_ioctl            = mlx5e_ioctl,
-#ifdef CONFIG_MLX5_CORE_EN_VXLAN
         .ndo_add_vxlan_port      = mlx5e_add_vxlan_port,
         .ndo_del_vxlan_port      = mlx5e_del_vxlan_port,
         .ndo_features_check      = mlx5e_features_check,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
index 217ac530a514..5def12c048e3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
@@ -48,18 +48,12 @@ struct mlx5e_vxlan_work {
 
 static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)
 {
-        return IS_ENABLED(CONFIG_MLX5_CORE_EN_VXLAN) &&
-                (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) &&
+        return (MLX5_CAP_ETH(mdev, tunnel_stateless_vxlan) &&
                 mlx5_core_is_pf(mdev));
 }
 
-#ifdef CONFIG_MLX5_CORE_EN_VXLAN
 void mlx5e_vxlan_init(struct mlx5e_priv *priv);
 void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);
-#else
-static inline void mlx5e_vxlan_init(struct mlx5e_priv *priv) {}
-static inline void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv) {}
-#endif
 
 void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, sa_family_t sa_family,
                             u16 port, int add);