From: Luca Tettamanti Disable data-corrupting 64-bit DMA on atl1. Signed-off-by: Luca Tettamanti Acked-by: Jay Cliburn Acked-by: Chris Snook Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/atl1/atl1_main.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff -puN drivers/net/atl1/atl1_main.c~atl1-disable-broken-64-bit-dma drivers/net/atl1/atl1_main.c --- a/drivers/net/atl1/atl1_main.c~atl1-disable-broken-64-bit-dma +++ a/drivers/net/atl1/atl1_main.c @@ -2202,21 +2202,16 @@ static int __devinit atl1_probe(struct p struct net_device *netdev; struct atl1_adapter *adapter; static int cards_found = 0; - bool pci_using_64 = true; int err; err = pci_enable_device(pdev); if (err) return err; - err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); if (err) { - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); - if (err) { - dev_err(&pdev->dev, "no usable DMA configuration\n"); - goto err_dma; - } - pci_using_64 = false; + dev_err(&pdev->dev, "no usable DMA configuration\n"); + goto err_dma; } /* Mark all PCI regions associated with PCI device * pdev as being reserved by owner atl1_driver_name @@ -2281,7 +2276,6 @@ static int __devinit atl1_probe(struct p netdev->ethtool_ops = &atl1_ethtool_ops; adapter->bd_number = cards_found; - adapter->pci_using_64 = pci_using_64; /* setup the private structure */ err = atl1_sw_init(adapter); @@ -2298,9 +2292,6 @@ static int __devinit atl1_probe(struct p */ /* netdev->features |= NETIF_F_TSO; */ - if (pci_using_64) - netdev->features |= NETIF_F_HIGHDMA; - netdev->features |= NETIF_F_LLTX; /* _