diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.31.5/linux-2.6.31-2-2-timberdale.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.31.5/linux-2.6.31-2-2-timberdale.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.31.5/linux-2.6.31-2-2-timberdale.patch b/meta-moblin/packages/linux/linux-moblin-2.6.31.5/linux-2.6.31-2-2-timberdale.patch new file mode 100644 index 0000000000..3a7e27881e --- /dev/null +++ b/meta-moblin/packages/linux/linux-moblin-2.6.31.5/linux-2.6.31-2-2-timberdale.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 9de5f61c79361bf6e9394d2f77a2b436d53deee5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yong Wang <yong.y.wang@intel.com> | ||
3 | Date: Tue, 30 Jun 2009 14:17:19 +0800 | ||
4 | Subject: [PATCH] Revert "net: num_dma_maps is not used" | ||
5 | |||
6 | This reverts commit eae3f29cc73f83cc3f1891d3ad40021b5172c630. | ||
7 | |||
8 | The IVI driver is a user of num_dma_maps. | ||
9 | |||
10 | Signed-off-by: Yong Wang <yong.y.wang@intel.com> | ||
11 | --- | ||
12 | include/linux/skbuff.h | 3 +++ | ||
13 | net/core/skb_dma_map.c | 1 + | ||
14 | 2 files changed, 4 insertions(+), 0 deletions(-) | ||
15 | |||
16 | diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h | ||
17 | index b47b3f0..468bc21 100644 | ||
18 | --- a/include/linux/skbuff.h | ||
19 | +++ b/include/linux/skbuff.h | ||
20 | @@ -198,6 +198,9 @@ struct skb_shared_info { | ||
21 | unsigned short gso_type; | ||
22 | __be32 ip6_frag_id; | ||
23 | union skb_shared_tx tx_flags; | ||
24 | +#ifdef CONFIG_HAS_DMA | ||
25 | + unsigned int num_dma_maps; | ||
26 | +#endif | ||
27 | struct sk_buff *frag_list; | ||
28 | struct skb_shared_hwtstamps hwtstamps; | ||
29 | skb_frag_t frags[MAX_SKB_FRAGS]; | ||
30 | diff --git a/net/core/skb_dma_map.c b/net/core/skb_dma_map.c | ||
31 | index 79687df..07d4ac5 100644 | ||
32 | --- a/net/core/skb_dma_map.c | ||
33 | +++ b/net/core/skb_dma_map.c | ||
34 | @@ -30,6 +30,7 @@ int skb_dma_map(struct device *dev, struct sk_buff *skb, | ||
35 | goto unwind; | ||
36 | sp->dma_maps[i] = map; | ||
37 | } | ||
38 | + sp->num_dma_maps = i + 1; | ||
39 | |||
40 | return 0; | ||
41 | |||
42 | -- | ||
43 | 1.6.0.6 | ||
44 | |||