diff options
| author |   Thomas Bogendoerfer <tbogendoerfer@suse.de> | 2019-10-15 16:42:45 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-15 20:50:05 -0700 |
| commit | 61c1d33daf7b5146f44d4363b3322f8cda6a6c43 (patch) | |
| tree | 2053e0eeb840b5ce9cb5be8056971d6e4566af3c /drivers/net/ethernet/i825xx/lib82596.c | |
| parent | sctp: change sctp_prot .no_autobind with true (diff) | |
| download | linux-dev-61c1d33daf7b5146f44d4363b3322f8cda6a6c43.tar.xz linux-dev-61c1d33daf7b5146f44d4363b3322f8cda6a6c43.zip | |
net: i82596: fix dma_alloc_attr for sni_82596
Commit 7f683b920479 ("i825xx: switch to switch to dma_alloc_attrs")
switched dma allocation over to dma_alloc_attr, but didn't convert
the SNI part to request consistent DMA memory. This broke sni_82596
since driver doesn't do dma_cache_sync for performance reasons.
Fix this by using different DMA_ATTRs for lasi_82596 and sni_82596.
Fixes: 7f683b920479 ("i825xx: switch to switch to dma_alloc_attrs")
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/i825xx/lib82596.c')
| -rw-r--r-- | drivers/net/ethernet/i825xx/lib82596.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c index 1274ad24d6af..f9742af7f142 100644 --- a/drivers/net/ethernet/i825xx/lib82596.c +++ b/drivers/net/ethernet/i825xx/lib82596.c @@ -1065,7 +1065,7 @@ static int i82596_probe(struct net_device *dev) dma = dma_alloc_attrs(dev->dev.parent, sizeof(struct i596_dma), &lp->dma_addr, GFP_KERNEL, - DMA_ATTR_NON_CONSISTENT); + LIB82596_DMA_ATTR); if (!dma) { printk(KERN_ERR "%s: Couldn't get shared memory\n", __FILE__); return -ENOMEM; @@ -1087,7 +1087,7 @@ static int i82596_probe(struct net_device *dev) i = register_netdev(dev); if (i) { dma_free_attrs(dev->dev.parent, sizeof(struct i596_dma), - dma, lp->dma_addr, DMA_ATTR_NON_CONSISTENT); + dma, lp->dma_addr, LIB82596_DMA_ATTR); return i; } |