From f38daabb340452e544043d25cccd9a850a9b4a8d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 2 Apr 2010 13:34:49 -0700 Subject: [PATCH] --- yaml --- r: 193922 b: refs/heads/master c: 9092c658bab215b2752fa59d2a36c05b74d1e9e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 542b4f48e71f..b65a34efe214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba343c7736b36d62d276e20383588bcf9403d6c6 +refs/heads/master: 9092c658bab215b2752fa59d2a36c05b74d1e9e9 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index e19cdae49fef..c6b52068d5ec 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -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)