diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 07:59:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 07:59:46 -0700 |
| commit | 0625bef6060fab4aab0e484130b59af5e9ac81bc (patch) | |
| tree | 2774beafe6bcab689ab5da5413726d8f8f606241 /drivers/net | |
| parent | a6a1d6485e77f28c11cdf943a3ed2a3fd83ac727 (diff) | |
| parent | ba82638247c10cfda32268c894f78f8124f54084 (diff) | |
| download | linux-3.10-0625bef6060fab4aab0e484130b59af5e9ac81bc.tar.gz linux-3.10-0625bef6060fab4aab0e484130b59af5e9ac81bc.tar.bz2 linux-3.10-0625bef6060fab4aab0e484130b59af5e9ac81bc.zip | |
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
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 2765a3ce9c2..c83501122d7 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -1109,6 +1109,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) } } + /* Allow large DMA segments, up to the firmware limit of 1 GB */ + dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024); + priv = kzalloc(sizeof *priv, GFP_KERNEL); if (!priv) { dev_err(&pdev->dev, "Device struct alloc failed, " |