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

Commit ea9627c8 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp' into for-next

parents 5b0c2759 83bdd3b9 8d8399de e413a823 c2c19dc3 c9bdad3c 532ec6f1

drivers/infiniband/core/iwcm.c

+2 −0
Original line number Diff line number Diff line
@@ -878,6 +878,8 @@ static void cm_work_handler(struct work_struct *_work) 
			}

			return;

		}

		if (empty)

			return;

		spin_lock_irqsave(&cm_id_priv->lock, flags);

	}

	spin_unlock_irqrestore(&cm_id_priv->lock, flags);

drivers/infiniband/core/verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ static void __ib_shared_qp_event_handler(struct ib_event *event, void *context) 
	struct ib_qp *qp = context;



	list_for_each_entry(event->element.qp, &qp->open_list, open_list)

		if (event->element.qp->event_handler)

			event->element.qp->event_handler(event, event->element.qp->qp_context);

}

drivers/infiniband/hw/cxgb3/cxio_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -62,13 +62,13 @@ static int __cxio_init_resource_fifo(struct kfifo *fifo, 
		kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32));

	if (random) {

		j = 0;

		random_bytes = random32();

		random_bytes = prandom_u32();

		for (i = 0; i < RANDOM_SIZE; i++)

			rarray[i] = i + skip_low;

		for (i = skip_low + RANDOM_SIZE; i < nr - skip_high; i++) {

			if (j >= RANDOM_SIZE) {

				j = 0;

				random_bytes = random32();

				random_bytes = prandom_u32();

			}

			idx = (random_bytes >> (j * 2)) & 0xF;

			kfifo_in(fifo,

drivers/infiniband/hw/cxgb3/iwch_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int iwch_reregister_phys_mem(struct ib_mr *mr, 
	__be64 *page_list = NULL;

	int shift = 0;

	u64 total_size;

	int npages;

	int npages = 0;

	int ret;



	PDBG("%s ib_mr %p ib_pd %p\n", __func__, mr, pd);

drivers/infiniband/hw/cxgb4/id_table.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ u32 c4iw_id_alloc(struct c4iw_id_table *alloc) 


	if (obj < alloc->max) {

		if (alloc->flags & C4IW_ID_TABLE_F_RANDOM)

			alloc->last += random32() % RANDOM_SKIP;

			alloc->last += prandom_u32() % RANDOM_SKIP;

		else

			alloc->last = obj + 1;

		if (alloc->last >= alloc->max)
@@ -88,7 +88,7 @@ int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num, 
	alloc->start = start;

	alloc->flags = flags;

	if (flags & C4IW_ID_TABLE_F_RANDOM)

		alloc->last = random32() % RANDOM_SKIP;

		alloc->last = prandom_u32() % RANDOM_SKIP;

	else

		alloc->last = 0;

	alloc->max  = num;