From 81941e0a76222b9bb189aac0da2e683eabc05e97 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 5 Jun 2009 04:03:35 +0000
Subject: [PATCH] --- yaml --- r: 150740 b: refs/heads/master c:
 eae3f29cc73f83cc3f1891d3ad40021b5172c630 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 3 ---
 trunk/net/core/skb_dma_map.c | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d6d35be75b1c..6b234efd4297 100644
--- 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
index 7305da92be8f..7485058125e3 100644
--- 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
index 86234923a3b7..7adb623ef664 100644
--- 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;