]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | --- linux-2.6.27.21/include/linux/skbuff.h 2009-07-22 08:06:40.000000000 +0000 |
2 | +++ linux-2.6.27.21/include/linux/skbuff.h.imq 2009-07-22 08:12:55.000000000 +0000 | |
3 | @@ -28,6 +28,9 @@ | |
4 | #include <linux/rcupdate.h> | |
5 | #include <linux/dmaengine.h> | |
6 | #include <linux/hrtimer.h> | |
7 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
8 | +#include <linux/imq.h> | |
9 | +#endif | |
10 | ||
11 | #define HAVE_ALLOC_SKB /* For the drivers to know */ | |
12 | #define HAVE_ALIGNABLE_SKB /* Ditto 8) */ | |
13 | @@ -274,6 +277,9 @@ | |
14 | * first. This is owned by whoever has the skb queued ATM. | |
15 | */ | |
16 | char cb[48]; | |
17 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
18 | + void *cb_next; | |
19 | +#endif | |
20 | ||
21 | unsigned int len, | |
22 | data_len; | |
23 | @@ -304,6 +310,9 @@ | |
24 | struct nf_conntrack *nfct; | |
25 | struct sk_buff *nfct_reasm; | |
26 | #endif | |
27 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
28 | + struct nf_queue_entry *nf_queue_entry; | |
29 | +#endif | |
30 | #ifdef CONFIG_BRIDGE_NETFILTER | |
31 | struct nf_bridge_info *nf_bridge; | |
32 | #endif | |
33 | @@ -330,6 +339,9 @@ | |
34 | proto_csum_blank:1; | |
35 | #endif | |
36 | /* 10-16 bit hole */ | |
37 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
38 | + __u8 imq_flags:IMQ_F_BITS; | |
39 | +#endif | |
40 | ||
41 | #ifdef CONFIG_NET_DMA | |
42 | dma_cookie_t dma_cookie; | |
43 | @@ -374,6 +386,11 @@ | |
44 | #endif | |
45 | } | |
46 | ||
47 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
48 | +extern int skb_save_cb(struct sk_buff *skb); | |
49 | +extern int skb_restore_cb(struct sk_buff *skb); | |
50 | +#endif | |
51 | + | |
52 | extern void kfree_skb(struct sk_buff *skb); | |
53 | extern void __kfree_skb(struct sk_buff *skb); | |
54 | extern struct sk_buff *__alloc_skb(unsigned int size, | |
55 | @@ -1688,6 +1705,10 @@ | |
56 | dst->nfct_reasm = src->nfct_reasm; | |
57 | nf_conntrack_get_reasm(src->nfct_reasm); | |
58 | #endif | |
59 | +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) | |
60 | + dst->imq_flags = src->imq_flags; | |
61 | + dst->nf_queue_entry = src->nf_queue_entry; | |
62 | +#endif | |
63 | #ifdef CONFIG_BRIDGE_NETFILTER | |
64 | dst->nf_bridge = src->nf_bridge; | |
65 | nf_bridge_get(src->nf_bridge); |