diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 18:32:26 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 18:32:26 +0400 |
| commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
| tree | d1b99d186edb9d203fafd896f19487125a2395af /net/netfilter/xt_socket.c | |
| parent | 2e2de2e314672c8b6644f67a35556d6df780493d (diff) | |
| parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
| download | linux-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.xz | |
Merge branch 'spi/merge' into spi/next
Diffstat (limited to 'net/netfilter/xt_socket.c')
| -rw-r--r-- | net/netfilter/xt_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_socket.c b/net/netfilter/xt_socket.c index 9cc46356b577..fe39f7e913df 100644 --- a/net/netfilter/xt_socket.c +++ b/net/netfilter/xt_socket.c @@ -143,9 +143,9 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par, ct = nf_ct_get(skb, &ctinfo); if (ct && !nf_ct_is_untracked(ct) && ((iph->protocol != IPPROTO_ICMP && - ctinfo == IP_CT_IS_REPLY + IP_CT_ESTABLISHED) || + ctinfo == IP_CT_ESTABLISHED_REPLY) || (iph->protocol == IPPROTO_ICMP && - ctinfo == IP_CT_IS_REPLY + IP_CT_RELATED)) && + ctinfo == IP_CT_RELATED_REPLY)) && (ct->status & IPS_SRC_NAT_DONE)) { daddr = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip; |