Commit 08d14c49 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-build-fixes' 



Saeed Mahameed says:

====================
Mellanox, mlx5 build fixes

I know net-next is closed but these patches are fixing some compiler
build and warnings issues people have been complaining about.

I hope it is not too late, but in case it is a lot of trouble for you,
I guess they can wait.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d44e3fa5 9446d17e

drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ mlx5e_ktls_type_check(struct mlx5_core_dev *mdev, 
		      struct tls_crypto_info *crypto_info) { return false; }

#endif



#ifdef CONFIG_MLX5_FPGA_TLS

enum {

	MLX5_ACCEL_TLS_TX = BIT(0),

	MLX5_ACCEL_TLS_RX = BIT(1),
@@ -103,6 +102,7 @@ struct mlx5_ifc_tls_flow_bits { 
	u8         reserved_at_2[0x1e];

};



#ifdef CONFIG_MLX5_FPGA_TLS

int mlx5_accel_tls_add_flow(struct mlx5_core_dev *mdev, void *flow,

			    struct tls_crypto_info *crypto_info,

			    u32 start_offload_tcp_sn, u32 *p_swid,

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

+2 −3
Original line number Diff line number Diff line
@@ -3390,10 +3390,9 @@ static int mlx5e_modify_channels_vsd(struct mlx5e_channels *chs, bool vsd) 
	return 0;

}



static int mlx5e_setup_tc_mqprio(struct net_device *netdev,

static int mlx5e_setup_tc_mqprio(struct mlx5e_priv *priv,

				 struct tc_mqprio_qopt *mqprio)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_channels new_channels = {};

	u8 tc = mqprio->num_tc;

	int err = 0;
@@ -3475,7 +3474,7 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
						  priv, priv, true);

#endif

	case TC_SETUP_QDISC_MQPRIO:

		return mlx5e_setup_tc_mqprio(dev, type_data);

		return mlx5e_setup_tc_mqprio(priv, type_data);

	default:

		return -EOPNOTSUPP;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1785,8 +1785,8 @@ static int esw_vport_add_ingress_acl_modify_metadata(struct mlx5_eswitch *esw, 
						     struct mlx5_vport *vport)

{

	u8 action[MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto)] = {};

	static const struct mlx5_flow_spec spec = {};

	struct mlx5_flow_act flow_act = {};

	struct mlx5_flow_spec spec = {};

	int err = 0;



	MLX5_SET(set_action_in, action, action_type, MLX5_ACTION_TYPE_SET);

CRA Git | Maintained and supported by SUSTech CRA and CCSE