Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / mlx4 / main.c

diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 05c5671749aa9c40adc7f8bc16fa0f6a5b039b46..62fa7eec5f0c448be487ed78bc4da11eaaa4a751 100644 (file)
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1204,6 +1204,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, "