Commit 9f1b0df7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-for-upstream-2021-02-10' of... 

Merge tag 'mlx5-for-upstream-2021-02-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux



Saeed Mahameed says:

====================
mlx5-for-upstream-2021-02-10

Misc cleanups and trivial fixes for net-next

1) spelling mistakes
2) error path checks fixes
3) unused includes and struct fields cleanup
4) build error when MLX5_ESWITCH=no
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f68cbaed b50c4892

Documentation/networking/device_drivers/ethernet/mellanox/mlx5.rst

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ Contents 
- `Devlink info`_

- `Devlink parameters`_

- `mlx5 subfunction`_

- `mlx5 port function`_

- `mlx5 function attributes`_

- `Devlink health reporters`_

- `mlx5 tracepoints`_



Enabling the driver and kconfig options

================================================

=======================================



| mlx5 core is modular and most of the major mlx5 core driver features can be selected (compiled in/out)

| at build time via kernel Kconfig flags.

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -149,14 +149,14 @@ config MLX5_IPSEC 
	IPsec support for the Connect-X family.



config MLX5_EN_IPSEC

	bool "IPSec XFRM cryptography-offload accelaration"

	bool "IPSec XFRM cryptography-offload acceleration"

	depends on MLX5_CORE_EN

	depends on XFRM_OFFLOAD

	depends on INET_ESP_OFFLOAD || INET6_ESP_OFFLOAD

	depends on MLX5_FPGA_IPSEC || MLX5_IPSEC

	default n

	help

	  Build support for IPsec cryptography-offload accelaration in the NIC.

	  Build support for IPsec cryptography-offload acceleration in the NIC.

	  Note: Support for hardware with this capability needs to be selected

	  for this option to become available.
@@ -192,7 +192,7 @@ config MLX5_TLS 
config MLX5_EN_TLS

	bool

	help

	Build support for TLS cryptography-offload accelaration in the NIC.

	Build support for TLS cryptography-offload acceleration in the NIC.

	Note: Support for hardware with this capability needs to be selected

	for this option to become available.

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "en.h"

#include "en_rep.h"



#ifdef CONFIG_MLX5_ESWITCH



enum {

	MLX5E_TC_TUNNEL_TYPE_UNKNOWN,

	MLX5E_TC_TUNNEL_TYPE_VXLAN,
@@ -99,4 +101,6 @@ int mlx5e_tc_tun_parse_udp_ports(struct mlx5e_priv *priv, 
				 void *headers_c,

				 void *headers_v);



#endif /* CONFIG_MLX5_ESWITCH */



#endif //__MLX5_EN_TC_TUNNEL_H__

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int blocking_event(struct notifier_block *nb, unsigned long event, void * 
		err = mlx5e_handle_trap_event(priv, data);

		break;

	default:

		netdev_warn(priv->netdev, "Sync event: Unknouwn event %ld\n", event);

		netdev_warn(priv->netdev, "Sync event: Unknown event %ld\n", event);

		err = -EINVAL;

	}

	return err;
@@ -5647,7 +5647,7 @@ int mlx5e_netdev_change_profile(struct mlx5e_priv *priv, 
	/* sanity */

	if (new_max_nch != priv->max_nch) {

		netdev_warn(priv->netdev,

			    "%s: Replacing profile with different max channles\n",

			    "%s: Replacing profile with different max channels\n",

			    __func__);

		return -EINVAL;

	}

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
 * SOFTWARE.

 */



#include <generated/utsrelease.h>

#include <linux/mlx5/fs.h>

#include <net/switchdev.h>

#include <net/pkt_cls.h>