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

Commit e6a00f66 authored by Yuval Shaia's avatar Yuval Shaia Committed by Doug Ledford
Browse files

IB/mlx4: Make function use_tunnel_data return void 



No need to return int if function always returns 0

Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent fa8410b3

drivers/infiniband/hw/mlx4/cq.c

+7 −7
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static int mlx4_ib_ipoib_csum_ok(__be16 status, __be16 checksum) 
		checksum == cpu_to_be16(0xffff);

}



static int use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc,

static void use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc,

			    unsigned tail, struct mlx4_cqe *cqe, int is_eth)

{

	struct mlx4_ib_proxy_sqp_hdr *hdr;
@@ -600,8 +600,6 @@ static int use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct 
		wc->slid        = be16_to_cpu(hdr->tun.slid_mac_47_32);

		wc->sl          = (u8) (be16_to_cpu(hdr->tun.sl_vid) >> 12);

	}



	return 0;

}



static void mlx4_ib_qp_sw_comp(struct mlx4_ib_qp *qp, int num_entries,
@@ -852,9 +850,11 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, 
		if (mlx4_is_mfunc(to_mdev(cq->ibcq.device)->dev)) {

			if ((*cur_qp)->mlx4_ib_qp_type &

			    (MLX4_IB_QPT_PROXY_SMI_OWNER |

			     MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI))

				return use_tunnel_data(*cur_qp, cq, wc, tail,

						       cqe, is_eth);

			     MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI)) {

				use_tunnel_data(*cur_qp, cq, wc, tail, cqe,

						is_eth);

				return 0;

			}

		}



		wc->slid	   = be16_to_cpu(cqe->rlid);