---

yaml --- r: 172089 b: refs/heads/master c: c81c2d9 h: refs/heads/master i: 172087: 012ad5b v: v3
git-mirror · Dec 3, 2009 · e3906b7 · e3906b7
1 parent c92b3a2
commit e3906b7
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 75 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4188d8affc8267a0f0f1b587a4d0a4b9b7f2999
+refs/heads/master: c81c2d95449cd218c2022ce6014c52fef1eb1f66
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -416,14 +416,6 @@ struct sk_buff {
 
 #include <asm/system.h>
 
-#ifdef CONFIG_HAS_DMA
-#include <linux/dma-mapping.h>
-extern int skb_dma_map(struct device *dev, struct sk_buff *skb,
-		       enum dma_data_direction dir);
-extern void skb_dma_unmap(struct device *dev, struct sk_buff *skb,
-			  enum dma_data_direction dir);
-#endif
-
 static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
 {
 	return (struct dst_entry *)skb->_skb_dst;

diff --git a/trunk/net/core/Makefile b/trunk/net/core/Makefile
@@ -6,7 +6,6 @@ obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
 	 gen_stats.o gen_estimator.o net_namespace.o
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
-obj-$(CONFIG_HAS_DMA) += skb_dma_map.o
 
 obj-y		     += dev.o ethtool.o dev_mcast.o dst.o netevent.o \
 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o

diff --git a/trunk/net/core/skb_dma_map.c b/trunk/net/core/skb_dma_map.c