diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-29 22:22:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-29 22:22:31 -0400 |
| commit | 53bd9728bf9be7fc3b3147e821dbeb71d767c354 (patch) | |
| tree | 3e4dcda28ef94b6d67d24d22b4e1ec76f6fcd968 /include/net | |
| parent | bd46cb6cf11867130a41ea9546dd65688b71f3c2 (diff) | |
| parent | d6d3f08b0fd998b647a05540cedd11a067b72867 (diff) | |
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) | |||
| 258 | /* Update TCP window tracking data when NAT mangles the packet */ | 258 | /* Update TCP window tracking data when NAT mangles the packet */ |
| 259 | extern void nf_conntrack_tcp_update(const struct sk_buff *skb, | 259 | extern void nf_conntrack_tcp_update(const struct sk_buff *skb, |
| 260 | unsigned int dataoff, | 260 | unsigned int dataoff, |
| 261 | struct nf_conn *ct, | 261 | struct nf_conn *ct, int dir, |
| 262 | int dir); | 262 | s16 offset); |
| 263 | 263 | ||
| 264 | /* Fake conntrack entry for untracked connections */ | 264 | /* Fake conntrack entry for untracked connections */ |
| 265 | extern struct nf_conn nf_conntrack_untracked; | 265 | extern struct nf_conn nf_conntrack_untracked; |