diff options
| author | Matthew Finlay <matt@mellanox.com> | 2016-02-22 18:17:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-24 13:50:22 -0500 |
| commit | 1afff42c062fe1d1f8d99423dddfb8ca5f100574 (patch) | |
| tree | 99d2477cecb955ba65b9450a35c9c42f942f3efe | |
| parent | 5f6d12d10f0c835fcd821f883f05c1107127986e (diff) | |
| download | linux-1afff42c062fe1d1f8d99423dddfb8ca5f100574.tar.bz2 | |
net/mlx5e: Protect en header file from redefinitions
add ifndef to en.h. needed for upcoming vxlan patchset.
Signed-off-by: Matthew Finlay <matt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index dfbc4e54efd4..786a2471ec0e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Mellanox Technologies. All rights reserved. + * Copyright (c) 2015-2016, Mellanox Technologies. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -29,6 +29,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#ifndef __MLX5_EN_H__ +#define __MLX5_EN_H__ #include <linux/if_vlan.h> #include <linux/etherdevice.h> @@ -678,3 +680,5 @@ int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets *ets); #endif u16 mlx5e_get_max_inline_cap(struct mlx5_core_dev *mdev); + +#endif /* __MLX5_EN_H__ */ |