diff options
| author | David S. Miller | 2009-12-03 22:23:12 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-03 22:23:12 +0100 |
| commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
| tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/ipv4/netfilter/ipt_MASQUERADE.c | |
| parent | bnx2: Update version to 2.0.3. (diff) | |
| parent | netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line (diff) | |
| download | kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.gz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.xz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv4/netfilter/ipt_MASQUERADE.c')
| -rw-r--r-- | net/ipv4/netfilter/ipt_MASQUERADE.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c index dada0863946d..650b54042b01 100644 --- a/net/ipv4/netfilter/ipt_MASQUERADE.c +++ b/net/ipv4/netfilter/ipt_MASQUERADE.c @@ -59,8 +59,8 @@ masquerade_tg(struct sk_buff *skb, const struct xt_target_param *par) ct = nf_ct_get(skb, &ctinfo); nat = nfct_nat(ct); - NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED - || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY)); + NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED || + ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY)); /* Source address is 0.0.0.0 - locally generated packet that is * probably not supposed to be masqueraded. |