diff options
author | Or Gerlitz <ogerlitz@mellanox.com> | 2014-04-01 12:27:13 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-02 00:25:51 +0400 |
commit | a66132f3eb514f42c49a3e8f57aab2ccd0360f06 (patch) | |
tree | 3ff54ad41d26def78043606175bb07b7a7631b59 /drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | |
parent | c5abe7c0a44ac2e8147543203de48b4aa0d4eaec (diff) | |
download | linux-a66132f3eb514f42c49a3e8f57aab2ccd0360f06.tar.xz |
net/mlx4: Set proper build dependancy with vxlan
Make sure that vxlan_get_rx_port() is present in the kernel build in a manner
consistent with mlx4, else mlx4 can be made built-in where vxlan a module and
the phase of the build linking fails. Add CONFIG_MLX4_EN_VXLAN for that.
Also, #ifdef the advertizement and implementation of the mlx4 vxlan ndo
calls and related code under this config directive.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4_en.h')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 36fc2a2b24c3..7a733c287744 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -559,8 +559,10 @@ struct mlx4_en_priv { struct work_struct linkstate_task; struct delayed_work stats_task; struct delayed_work service_task; +#ifdef CONFIG_MLX4_EN_VXLAN struct work_struct vxlan_add_task; struct work_struct vxlan_del_task; +#endif struct mlx4_en_perf_stats pstats; struct mlx4_en_pkt_stats pkstats; struct mlx4_en_port_stats port_stats; |