---

yaml --- r: 150740 b: refs/heads/master c: eae3f29 h: refs/heads/master v: v3
git-mirror · Jun 8, 2009 · 81941e0 · 81941e0
1 parent 2a92ff4
commit 81941e0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f957bcf0164e45bd77867e02412035e1c2fd7058
+refs/heads/master: eae3f29cc73f83cc3f1891d3ad40021b5172c630
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -194,9 +194,6 @@ struct skb_shared_info {
 	unsigned short  gso_type;
 	__be32          ip6_frag_id;
 	union skb_shared_tx tx_flags;
-#ifdef CONFIG_HAS_DMA
-	unsigned int	num_dma_maps;
-#endif
 	struct sk_buff	*frag_list;
 	struct skb_shared_hwtstamps hwtstamps;
 	skb_frag_t	frags[MAX_SKB_FRAGS];

diff --git a/trunk/net/core/skb_dma_map.c b/trunk/net/core/skb_dma_map.c
@@ -30,7 +30,6 @@ int skb_dma_map(struct device *dev, struct sk_buff *skb,
 			goto unwind;
 		sp->dma_maps[i + 1] = map;
 	}
-	sp->num_dma_maps = i + 1;
 
 	return 0;