aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sgi
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-11-04 11:45:12 +0100
committerDavid S. Miller <davem@davemloft.net>2019-11-04 11:30:14 -0800
commit59511bcf33f95e2bcf1100e8fde31e2d4a15f3a0 (patch)
tree7a87577a722247063923b3d49cad263e64695e32 /drivers/net/ethernet/sgi
parentnet: sgi: ioc3-eth: don't abuse dma_direct_* calls (diff)
downloadlinux-dev-59511bcf33f95e2bcf1100e8fde31e2d4a15f3a0.tar.xz
linux-dev-59511bcf33f95e2bcf1100e8fde31e2d4a15f3a0.zip
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: ed870f6a7aa2 ("net: sgi: ioc3-eth: use dma-direct for dma allocations") Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sgi')
-rw-r--r--drivers/net/ethernet/sgi/ioc3-eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 477af82bf8a9..8a684d882e63 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -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;