diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-21 10:46:34 -0800 |
| commit | 1a324727caa26cd65a359a958c90fbd251d4aa49 (patch) | |
| tree | 543a4f413c1c99f4b5be0b3c5f3744c9e4581db9 /include/linux/skbuff.h | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
| parent | 461ddf3b90bb149b99c3f675959c1bd6b11ed936 (diff) | |
| download | op-kernel-dev-1a324727caa26cd65a359a958c90fbd251d4aa49.zip op-kernel-dev-1a324727caa26cd65a359a958c90fbd251d4aa49.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0a8ea8b..8c5d600 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -206,6 +206,7 @@ enum { * @nfct: Associated connection, if any * @ipvs_property: skbuff is owned by ipvs * @nfctinfo: Relationship of this skb to the connection + * @nfct_reasm: netfilter conntrack re-assembly pointer * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c * @tc_index: Traffic control index * @tc_verd: traffic control verdict @@ -264,16 +265,14 @@ struct sk_buff { nohdr:1, nfctinfo:3; __u8 pkt_type:3, - fclone:2; + fclone:2, + ipvs_property:1; __be16 protocol; void (*destructor)(struct sk_buff *skb); #ifdef CONFIG_NETFILTER __u32 nfmark; struct nf_conntrack *nfct; -#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) - __u8 ipvs_property:1; -#endif #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) struct sk_buff *nfct_reasm; #endif |
