|
@@ -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;
|
|
|
}
|