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

Commit 3cc08fc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)
  IB/qib: Add missing <linux/slab.h> include
  IB/ehca: Drop unnecessary NULL test
  RDMA/nes: Fix confusing if statement indentation
  IB/ehca: Init irq tasklet before irq can happen
  RDMA/nes: Fix misindented code
  RDMA/nes: Fix showing wqm_quanta
  RDMA/nes: Get rid of "set but not used" variables
  RDMA/nes: Read firmware version from correct place
  IB/srp: Export req_lim via sysfs
  IB/srp: Make receive buffer handling more robust
  IB/srp: Use print_hex_dump()
  IB: Rename RAW_ETY to RAW_ETHERTYPE
  RDMA/nes: Fix two sparse warnings
  RDMA/cxgb3: Make needlessly global iwch_l2t_send() static
  IB/iser: Make needlessly global iser_alloc_rx_descriptors() static
  RDMA/cxgb4: Add timeouts when waiting for FW responses
  IB/qib: Fix race between qib_error_qp() and receive packet processing
  IB/qib: Limit the number of packets processed per interrupt
  IB/qib: Allow writes to the diag_counters to be able to clear them
  IB/qib: Set cfgctxts to number of CPUs by default
  ...
parents faa38b5e 03b37ecd

drivers/infiniband/core/cm.c

+6 −4
Original line number Diff line number Diff line
@@ -2409,10 +2409,12 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id, 
		msg_response = CM_MSG_RESPONSE_REP;

		break;

	case IB_CM_ESTABLISHED:

		if (cm_id->lap_state == IB_CM_LAP_RCVD) {

			cm_state = cm_id->state;

			lap_state = IB_CM_MRA_LAP_SENT;

			msg_response = CM_MSG_RESPONSE_OTHER;

			break;

		}

	default:

		ret = -EINVAL;

		goto error1;

drivers/infiniband/core/user_mad.c

+0 −2
Original line number Diff line number Diff line
@@ -1085,7 +1085,6 @@ err_cdev: 
static void ib_umad_kill_port(struct ib_umad_port *port)

{

	struct ib_umad_file *file;

	int already_dead;

	int id;



	dev_set_drvdata(port->dev,    NULL);
@@ -1103,7 +1102,6 @@ static void ib_umad_kill_port(struct ib_umad_port *port) 


	list_for_each_entry(file, &port->file_list, port_list) {

		mutex_lock(&file->mutex);

		already_dead = file->agents_dead;

		file->agents_dead = 1;

		mutex_unlock(&file->mutex);

drivers/infiniband/core/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ EXPORT_SYMBOL(ib_create_qp); 


static const struct {

	int			valid;

	enum ib_qp_attr_mask	req_param[IB_QPT_RAW_ETY + 1];

	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETY + 1];

	enum ib_qp_attr_mask	req_param[IB_QPT_RAW_ETHERTYPE + 1];

	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETHERTYPE + 1];

} qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {

	[IB_QPS_RESET] = {

		[IB_QPS_RESET] = { .valid = 1 },

drivers/infiniband/hw/cxgb3/iwch_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void stop_ep_timer(struct iwch_ep *ep) 
	put_ep(&ep->com);

}



int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, struct l2t_entry *l2e)

static int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, struct l2t_entry *l2e)

{

	int	error = 0;

	struct cxio_rdev *rdev;

drivers/infiniband/hw/cxgb3/iwch_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
	}

	num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,

		  qhp->wq.sq_size_log2);

	if (num_wrs <= 0) {

	if (num_wrs == 0) {

		spin_unlock_irqrestore(&qhp->lock, flag);

		err = -ENOMEM;

		goto out;
@@ -554,7 +554,7 @@ int iwch_bind_mw(struct ib_qp *qp, 
	}

	num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,

			    qhp->wq.sq_size_log2);

	if ((num_wrs) <= 0) {

	if (num_wrs == 0) {

		spin_unlock_irqrestore(&qhp->lock, flag);

		return -ENOMEM;

	}