Merge branch 'misc-fixes' into k.o/for-4.8-rc (049b1e7c) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/infiniband/hw/i40iw/i40iw_cm.c

+1 −21

Original line number	Diff line number	Diff line
		@@ -3346,26 +3346,6 @@ int i40iw_cm_disconn(struct i40iw_qp *iwqp)
		return 0;
		}

		/**
		* i40iw_loopback_nop - Send a nop
		* @qp: associated hw qp
		*/
		static void i40iw_loopback_nop(struct i40iw_sc_qp *qp)
		{
		u64 *wqe;
		u64 header;

		wqe = qp->qp_uk.sq_base->elem;
		set_64bit_val(wqe, 0, 0);
		set_64bit_val(wqe, 8, 0);
		set_64bit_val(wqe, 16, 0);

		header = LS_64(I40IWQP_OP_NOP, I40IWQPSQ_OPCODE) \|
		LS_64(0, I40IWQPSQ_SIGCOMPL) \|
		LS_64(qp->qp_uk.swqe_polarity, I40IWQPSQ_VALID);
		set_64bit_val(wqe, 24, header);
		}

		/**
		* i40iw_qp_disconnect - free qp and close cm
		* @iwqp: associate qp for the connection
		@@ -3638,7 +3618,7 @@ int i40iw_accept(struct iw_cm_id cm_id, struct iw_cm_conn_param conn_param)
		} else {
		if (iwqp->page)
		iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page);
		i40iw_loopback_nop(&iwqp->sc_qp);
		dev->iw_priv_qp_ops->qp_send_lsmm(&iwqp->sc_qp, NULL, 0, 0);
		}

		if (iwqp->page)