Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9092c658 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: illegal_highdma() fix 



Followup to commit 5acbbd42
(net: change illegal_highdma to use dma_mask)

If dev->dev.parent is NULL, we should not try to dereference it.

Dont force inline illegal_highdma() as its pretty big now.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba343c77

net/core/dev.c

+3 −1
Original line number Diff line number Diff line
@@ -1801,7 +1801,7 @@ EXPORT_SYMBOL(netdev_rx_csum_fault); 
 * 2. No high memory really exists on this machine.

 */



static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)

static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)

{

#ifdef CONFIG_HIGHMEM

	int i;
@@ -1814,6 +1814,8 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb) 
	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++) {

			dma_addr_t addr = page_to_phys(skb_shinfo(skb)->frags[i].page);

			if (!pdev->dma_mask || addr + PAGE_SIZE - 1 > *pdev->dma_mask)