aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 4f2014994a84..08976b08df5b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1239,7 +1239,6 @@ void netdev_rx_csum_fault(struct net_device *dev)
1239EXPORT_SYMBOL(netdev_rx_csum_fault); 1239EXPORT_SYMBOL(netdev_rx_csum_fault);
1240#endif 1240#endif
1241 1241
1242#ifdef CONFIG_HIGHMEM
1243/* Actually, we should eliminate this check as soon as we know, that: 1242/* Actually, we should eliminate this check as soon as we know, that:
1244 * 1. IOMMU is present and allows to map all the memory. 1243 * 1. IOMMU is present and allows to map all the memory.
1245 * 2. No high memory really exists on this machine. 1244 * 2. No high memory really exists on this machine.
@@ -1247,6 +1246,7 @@ EXPORT_SYMBOL(netdev_rx_csum_fault);
1247 1246
1248static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb) 1247static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
1249{ 1248{
1249#ifdef CONFIG_HIGHMEM
1250 int i; 1250 int i;
1251 1251
1252 if (dev->features & NETIF_F_HIGHDMA) 1252 if (dev->features & NETIF_F_HIGHDMA)
@@ -1256,11 +1256,9 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
1256 if (PageHighMem(skb_shinfo(skb)->frags[i].page)) 1256 if (PageHighMem(skb_shinfo(skb)->frags[i].page))
1257 return 1; 1257 return 1;
1258 1258
1259#endif
1259 return 0; 1260 return 0;
1260} 1261}
1261#else
1262#define illegal_highdma(dev, skb) (0)
1263#endif
1264 1262
1265struct dev_gso_cb { 1263struct dev_gso_cb {
1266 void (*destructor)(struct sk_buff *skb); 1264 void (*destructor)(struct sk_buff *skb);