]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/skbuff-xen-imq.diff
Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen
[people/pmueller/ipfire-2.x.git] / src / patches / skbuff-xen-imq.diff
1 --- linux-2.6.27.21/include/linux/skbuff.h 2009-04-03 10:39:10.000000000 +0000
2 +++ linux-2.6.27.21/include/linux/skbuff.h 2009-04-03 10:41:59.000000000 +0000
3 @@ -330,11 +330,17 @@
4 #if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
5 __u8 do_not_encrypt:1;
6 #endif
7 - /* 0/13/14 bit hole */
8 +
9 #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
10 __u8 imq_flags:IMQ_F_BITS;
11 #endif
12
13 +#ifdef CONFIG_XEN
14 + __u8 proto_data_valid:1,
15 + proto_csum_blank:1;
16 +#endif
17 + /* 10-16 bit hole */
18 +
19 #ifdef CONFIG_NET_DMA
20 dma_cookie_t dma_cookie;
21 #endif