diff options
| author | David S. Miller | 2009-06-30 04:22:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-06-30 04:22:31 +0200 |
| commit | 53bd9728bf9be7fc3b3147e821dbeb71d767c354 (patch) | |
| tree | 3e4dcda28ef94b6d67d24d22b4e1ec76f6fcd968 /include/net | |
| parent | be2net: Fix to avoid a crash seen on PPC with LRO and Jumbo frames. (diff) | |
| parent | netfilter: xtables: conntrack match revision 2 (diff) | |
| download | kernel-qcow2-linux-53bd9728bf9be7fc3b3147e821dbeb71d767c354.tar.gz kernel-qcow2-linux-53bd9728bf9be7fc3b3147e821dbeb71d767c354.tar.xz kernel-qcow2-linux-53bd9728bf9be7fc3b3147e821dbeb71d767c354.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index a632689b61b4..cbdd6284996d 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; |