Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10961c56 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove unused parameter 



mdev is unused in mlx5e_rx_is_linear_skb.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b1b187e1

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+3 −4
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params) 
	return MLX5_MPWRQ_LOG_WQE_SZ - order_base_2(linear_frag_sz);

}



bool mlx5e_rx_is_linear_skb(struct mlx5_core_dev *mdev,

			    struct mlx5e_params *params)

bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params)

{

	u32 frag_sz = mlx5e_rx_get_linear_frag_sz(params);
@@ -44,7 +43,7 @@ bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev, 
	s8 signed_log_num_strides_param;

	u8 log_num_strides;



	if (!mlx5e_rx_is_linear_skb(mdev, params))

	if (!mlx5e_rx_is_linear_skb(params))

		return false;



	if (order_base_2(frag_sz) > MLX5_MAX_MPWQE_LOG_WQE_STRIDE_SZ)
@@ -98,7 +97,7 @@ u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev, 
	linear_rq_headroom += NET_IP_ALIGN;



	is_linear_skb = (params->rq_wq_type == MLX5_WQ_TYPE_CYCLIC) ?

		mlx5e_rx_is_linear_skb(mdev, params) :

		mlx5e_rx_is_linear_skb(params) :

		mlx5e_rx_mpwqe_is_linear_skb(mdev, params);



	return is_linear_skb ? linear_rq_headroom : 0;

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

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 


u32 mlx5e_rx_get_linear_frag_sz(struct mlx5e_params *params);

u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params);

bool mlx5e_rx_is_linear_skb(struct mlx5_core_dev *mdev,

			    struct mlx5e_params *params);

bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params);

bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *mdev,

				  struct mlx5e_params *params);

u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5e_params *params);

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

+5 −5
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
			goto err_free;

		}



		rq->wqe.skb_from_cqe = mlx5e_rx_is_linear_skb(mdev, params) ?

		rq->wqe.skb_from_cqe = mlx5e_rx_is_linear_skb(params) ?

			mlx5e_skb_from_cqe_linear :

			mlx5e_skb_from_cqe_nonlinear;

		rq->mkey_be = c->mkey_be;
@@ -1960,7 +1960,7 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
		byte_count += MLX5E_METADATA_ETHER_LEN;

#endif



	if (mlx5e_rx_is_linear_skb(mdev, params)) {

	if (mlx5e_rx_is_linear_skb(params)) {

		int frag_stride;



		frag_stride = mlx5e_rx_get_linear_frag_sz(params);
@@ -3722,7 +3722,7 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu, 
	new_channels.params.sw_mtu = new_mtu;



	if (params->xdp_prog &&

	    !mlx5e_rx_is_linear_skb(priv->mdev, &new_channels.params)) {

	    !mlx5e_rx_is_linear_skb(&new_channels.params)) {

		netdev_err(netdev, "MTU(%d) > %d is not allowed while XDP enabled\n",

			   new_mtu, MLX5E_XDP_MAX_MTU);

		err = -EINVAL;
@@ -4163,7 +4163,7 @@ static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog) 
	new_channels.params = priv->channels.params;

	new_channels.params.xdp_prog = prog;



	if (!mlx5e_rx_is_linear_skb(priv->mdev, &new_channels.params)) {

	if (!mlx5e_rx_is_linear_skb(&new_channels.params)) {

		netdev_warn(netdev, "XDP is not allowed with MTU(%d) > %d\n",

			    new_channels.params.sw_mtu, MLX5E_XDP_MAX_MTU);

		return -EINVAL;
@@ -4506,7 +4506,7 @@ void mlx5e_build_rq_params(struct mlx5_core_dev *mdev, 
	if (!slow_pci_heuristic(mdev) &&

	    mlx5e_striding_rq_possible(mdev, params) &&

	    (mlx5e_rx_mpwqe_is_linear_skb(mdev, params) ||

	     !mlx5e_rx_is_linear_skb(mdev, params)))

	     !mlx5e_rx_is_linear_skb(params)))

		MLX5E_SET_PFLAG(params, MLX5E_PFLAG_RX_STRIDING_RQ, true);

	mlx5e_set_rq_type(mdev, params);

	mlx5e_init_rq_type_params(mdev, params);