diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
| commit | 334f8b2afd9652e20f67ddee4fec483ed860425b (patch) | |
| tree | 35d4fb46a9dc145e831fe5da026f2bfd9ee6657c /net/netfilter/xt_conntrack.c | |
| parent | 7477fd2e6b676fcd15861c2a96a7172f71afe0a5 (diff) | |
| parent | ef1a5a50bbd509b8697dcd4d13017e9e0053867b (diff) | |
| download | linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.gz linux-334f8b2afd9652e20f67ddee4fec483ed860425b.tar.bz2 linux-334f8b2afd9652e20f67ddee4fec483ed860425b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26
Diffstat (limited to 'net/netfilter/xt_conntrack.c')
| -rw-r--r-- | net/netfilter/xt_conntrack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c index 0c50b2894055..d61412f58ef7 100644 --- a/net/netfilter/xt_conntrack.c +++ b/net/netfilter/xt_conntrack.c @@ -65,7 +65,7 @@ conntrack_mt_v0(const struct sk_buff *skb, const struct net_device *in, } if (sinfo->flags & XT_CONNTRACK_PROTO && - FWINV(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum != + FWINV(nf_ct_protonum(ct) != sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum, XT_CONNTRACK_PROTO)) return false; @@ -174,7 +174,7 @@ ct_proto_port_check(const struct xt_conntrack_mtinfo1 *info, tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; if ((info->match_flags & XT_CONNTRACK_PROTO) && - (tuple->dst.protonum == info->l4proto) ^ + (nf_ct_protonum(ct) == info->l4proto) ^ !(info->invert_flags & XT_CONNTRACK_PROTO)) return false; |