diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-04-03 20:31:35 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-07 07:15:41 +0200 |
| commit | ab74cfebafa3b71caa1e82793032b4867dcf5ea6 (patch) | |
| tree | 2c2bdf774f6e393e967b349b54ddda7ec9d4aab3 | |
| parent | ide: remove the PCI_DMA_BUS_IS_PHYS check (diff) | |
| download | linux-ab74cfebafa3b71caa1e82793032b4867dcf5ea6.tar.xz linux-ab74cfebafa3b71caa1e82793032b4867dcf5ea6.zip | |
net: remove the PCI_DMA_BUS_IS_PHYS check in illegal_highdma
These days the dma mapping routines must be able to handle any address
supported by the device, be that using an iommu, or swiotlb if none is
supported. With that the PCI_DMA_BUS_IS_PHYS check in illegal_highdma
is not needed and can be removed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index af0558b00c6c..060256cbf4f3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2884,11 +2884,7 @@ void netdev_rx_csum_fault(struct net_device *dev) EXPORT_SYMBOL(netdev_rx_csum_fault); #endif -/* Actually, we should eliminate this check as soon as we know, that: - * 1. IOMMU is present and allows to map all the memory. - * 2. No high memory really exists on this machine. - */ - +/* XXX: check that highmem exists at all on the given machine. */ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) { #ifdef CONFIG_HIGHMEM @@ -2902,20 +2898,6 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) return 1; } } - - if (PCI_DMA_BUS_IS_PHYS) { - struct device *pdev = dev->dev.parent; - - if (!pdev) - return 0; - for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { - skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; - dma_addr_t addr = page_to_phys(skb_frag_page(frag)); - - if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask) - return 1; - } - } #endif return 0; } |