From b71cd3822a2825fbbb1458e44e8166fd354cf53e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 11 Sep 2008 04:48:58 -0700 Subject: [PATCH] --- yaml --- r: 111598 b: refs/heads/master c: 271bff7afbb2cbaa81e744006ad2fff1f3e10b1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6d3a27173582..83a77c94df9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e493d1946a0b26b79001c18d7312d536156ff5a +refs/heads/master: 271bff7afbb2cbaa81e744006ad2fff1f3e10b1b diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 909923717830..4b2be23903c4 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -146,8 +146,14 @@ struct skb_shared_info { unsigned short gso_segs; unsigned short gso_type; __be32 ip6_frag_id; +#ifdef CONFIG_HAS_DMA + unsigned int num_dma_maps; +#endif struct sk_buff *frag_list; skb_frag_t frags[MAX_SKB_FRAGS]; +#ifdef CONFIG_HAS_DMA + dma_addr_t dma_maps[MAX_SKB_FRAGS + 1]; +#endif }; /* We divide dataref into two halves. The higher 16 bits hold references