Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

2009-06-29 19:22:31 -07:00
parent bd46cb6cf1 d6d3f08b0f
commit 53bd9728bf
8 changed files with 95 additions and 19 deletions
@@ -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;