diff options
| author | David S. Miller | 2010-05-21 08:12:18 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-05-21 08:12:18 +0200 |
| commit | 41499bd6766314079417d1467c466d31b8612fec (patch) | |
| tree | 5ce777cd47603977ee55059891c67b8a420e05a1 /include | |
| parent | gro: Fix bogus gso_size on the first fraglist entry (diff) | |
| parent | netfilter: fix description of expected checkentry return code on xt_target (diff) | |
| download | kernel-qcow2-linux-41499bd6766314079417d1467c466d31b8612fec.tar.gz kernel-qcow2-linux-41499bd6766314079417d1467c466d31b8612fec.tar.xz kernel-qcow2-linux-41499bd6766314079417d1467c466d31b8612fec.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c2ee5d8550cf..c00cc0c4d0b7 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -333,7 +333,7 @@ struct xt_target { /* Called when user tries to insert an entry of this type: hook_mask is a bitmask of hooks from which it can be called. */ - /* Should return true or false, or an error code (-Exxxx). */ + /* Should return 0 on success or an error code otherwise (-Exxxx). */ int (*checkentry)(const struct xt_tgchk_param *); /* Called when entry of this type deleted. */ diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index dffde8e6920e..3d7524fba194 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -61,7 +61,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) int ret = NF_ACCEPT; if (ct && ct != &nf_conntrack_untracked) { - if (!nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct)) + if (!nf_ct_is_confirmed(ct)) ret = __nf_conntrack_confirm(skb); if (likely(ret == NF_ACCEPT)) nf_ct_deliver_cached_events(ct); |