diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-29 19:22:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-29 19:22:31 -0700 |
| commit | 53bd9728bf9be7fc3b3147e821dbeb71d767c354 (patch) | |
| tree | 3e4dcda28ef94b6d67d24d22b4e1ec76f6fcd968 /include | |
| parent | bd46cb6cf11867130a41ea9546dd65688b71f3c2 (diff) | |
| parent | d6d3f08b0fd998b647a05540cedd11a067b72867 (diff) | |
| download | kernel_samsung_tuna-53bd9728bf9be7fc3b3147e821dbeb71d767c354.zip kernel_samsung_tuna-53bd9728bf9be7fc3b3147e821dbeb71d767c354.tar.gz kernel_samsung_tuna-53bd9728bf9be7fc3b3147e821dbeb71d767c354.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/xt_conntrack.h | 13 | ||||
| -rw-r--r-- | include/linux/netfilter/xt_osf.h | 2 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index 3430c77..7ae0533 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h @@ -81,4 +81,17 @@ struct xt_conntrack_mtinfo1 { __u8 state_mask, status_mask; }; +struct xt_conntrack_mtinfo2 { + union nf_inet_addr origsrc_addr, origsrc_mask; + union nf_inet_addr origdst_addr, origdst_mask; + union nf_inet_addr replsrc_addr, replsrc_mask; + union nf_inet_addr repldst_addr, repldst_mask; + __u32 expires_min, expires_max; + __u16 l4proto; + __be16 origsrc_port, origdst_port; + __be16 replsrc_port, repldst_port; + __u16 match_flags, invert_flags; + __u16 state_mask, status_mask; +}; + #endif /*_XT_CONNTRACK_H*/ diff --git a/include/linux/netfilter/xt_osf.h b/include/linux/netfilter/xt_osf.h index fd2272e..18afa49 100644 --- a/include/linux/netfilter/xt_osf.h +++ b/include/linux/netfilter/xt_osf.h @@ -20,6 +20,8 @@ #ifndef _XT_OSF_H #define _XT_OSF_H +#include <linux/types.h> + #define MAXGENRELEN 32 #define XT_OSF_GENRE (1<<0) diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index a632689..cbdd628 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -258,8 +258,8 @@ static inline bool nf_ct_kill(struct nf_conn *ct) /* Update TCP window tracking data when NAT mangles the packet */ extern void nf_conntrack_tcp_update(const struct sk_buff *skb, unsigned int dataoff, - struct nf_conn *ct, - int dir); + struct nf_conn *ct, int dir, + s16 offset); /* Fake conntrack entry for untracked connections */ extern struct nf_conn nf_conntrack_untracked; |