Commit 59511bcf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

net: sgi: ioc3-eth: fix usage of GFP_* flags 



dma_alloc_coherent always zeroes memory, there is no need for
__GFP_ZERO.  Also doing a GFP_ATOMIC allocation just before a GFP_KERNEL
one is clearly bogus.

Fixes: ed870f6a ("net: sgi: ioc3-eth: use dma-direct for dma allocations")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4dd14747

drivers/net/ethernet/sgi/ioc3-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1243,7 +1243,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* Allocate rx ring.  4kb = 512 entries, must be 4kb aligned */

	ip->rxr = dma_alloc_coherent(ip->dma_dev, RX_RING_SIZE, &ip->rxr_dma,

				     GFP_ATOMIC);

				     GFP_KERNEL);

	if (!ip->rxr) {

		pr_err("ioc3-eth: rx ring allocation failed\n");

		err = -ENOMEM;
@@ -1252,7 +1252,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* Allocate tx rings.  16kb = 128 bufs, must be 16kb aligned  */

	ip->txr = dma_alloc_coherent(ip->dma_dev, TX_RING_SIZE, &ip->txr_dma,

				     GFP_KERNEL | __GFP_ZERO);

				     GFP_KERNEL);

	if (!ip->txr) {

		pr_err("ioc3-eth: tx ring allocation failed\n");

		err = -ENOMEM;