Commit 0625bef6 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:
  IB: Increase DMA max_segment_size on Mellanox hardware
  IB/mad: Improve an error message so error code is included
  RDMA/nes: Don't print success message at level KERN_ERR
  RDMA/addr: Fix return of uninitialized ret value
  IB/srp: try to use larger FMR sizes to cover our mappings
  IB/srp: add support for indirect tables that don't fit in SRP_CMD
  IB/srp: rework mapping engine to use multiple FMR entries
  IB/srp: allow sg_tablesize to be set for each target
  IB/srp: move IB CM setup completion into its own function
  IB/srp: always avoid non-zero offsets into an FMR
parents a6a1d648 ba826382

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int addr4_resolve(struct sockaddr_in *src_in, 


	/* If the device does ARP internally, return 'done' */

	if (rt->dst.dev->flags & IFF_NOARP) {

		rdma_copy_addr(addr, rt->dst.dev, NULL);

		ret = rdma_copy_addr(addr, rt->dst.dev, NULL);

		goto put;

	}

drivers/infiniband/core/agent.c

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ void agent_send_response(struct ib_mad *mad, struct ib_grh *grh, 
	agent = port_priv->agent[qpn];

	ah = ib_create_ah_from_wc(agent->qp->pd, wc, grh, port_num);

	if (IS_ERR(ah)) {

		printk(KERN_ERR SPFX "ib_create_ah_from_wc error\n");

		printk(KERN_ERR SPFX "ib_create_ah_from_wc error %ld\n",

			PTR_ERR(ah));

		return;

	}

drivers/infiniband/hw/mthca/mthca_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,9 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type) 
		}

	}



	/* We can handle large RDMA requests, so allow larger segments. */

	dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);



	mdev = (struct mthca_dev *) ib_alloc_device(sizeof *mdev);

	if (!mdev) {

		dev_err(&pdev->dev, "Device struct alloc failed, "

drivers/infiniband/hw/nes/nes.c

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i 
	nesdev->netdev_count++;

	nesdev->nesadapter->netdev_count++;



	printk(KERN_ERR PFX "%s: NetEffect RNIC driver successfully loaded.\n",

	printk(KERN_INFO PFX "%s: NetEffect RNIC driver successfully loaded.\n",

			pci_name(pcidev));

	return 0;

drivers/infiniband/ulp/srp/ib_srp.c

+481 −244

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE