netfilter: nf_conntrack: add support for "conntrack zones"

[deliverable/linux.git] / net / netfilter / nf_conntrack_h323_main.c

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 687bd633c3d7020c277ba0f25b6e3033fd5053c7..a1c8dd917e1202b375f1a6d4f788880035b78a41 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -29,6 +29,7 @@
 #include <net/netfilter/nf_conntrack_expect.h>
 #include <net/netfilter/nf_conntrack_ecache.h>
 #include <net/netfilter/nf_conntrack_helper.h>
+#include <net/netfilter/nf_conntrack_zones.h>
 #include <linux/netfilter/nf_conntrack_h323.h>
 
 /* Parameters */
@@ -1167,7 +1168,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_q931[] __read_mostly = {
                .name                   = "Q.931",
                .me                     = THIS_MODULE,
                .tuple.src.l3num        = AF_INET,
-               .tuple.src.u.tcp.port   = __constant_htons(Q931_PORT),
+               .tuple.src.u.tcp.port   = cpu_to_be16(Q931_PORT),
                .tuple.dst.protonum     = IPPROTO_TCP,
                .help                   = q931_help,
                .expect_policy          = &q931_exp_policy,
@@ -1176,7 +1177,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_q931[] __read_mostly = {
                .name                   = "Q.931",
                .me                     = THIS_MODULE,
                .tuple.src.l3num        = AF_INET6,
-               .tuple.src.u.tcp.port   = __constant_htons(Q931_PORT),
+               .tuple.src.u.tcp.port   = cpu_to_be16(Q931_PORT),
                .tuple.dst.protonum     = IPPROTO_TCP,
                .help                   = q931_help,
                .expect_policy          = &q931_exp_policy,
@@ -1216,7 +1217,7 @@ static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
        tuple.dst.u.tcp.port = port;
        tuple.dst.protonum = IPPROTO_TCP;
 
-       exp = __nf_ct_expect_find(net, &tuple);
+       exp = __nf_ct_expect_find(net, nf_ct_zone(ct), &tuple);
        if (exp && exp->master == ct)
                return exp;
        return NULL;
@@ -1741,7 +1742,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = {
                .name                   = "RAS",
                .me                     = THIS_MODULE,
                .tuple.src.l3num        = AF_INET,
-               .tuple.src.u.udp.port   = __constant_htons(RAS_PORT),
+               .tuple.src.u.udp.port   = cpu_to_be16(RAS_PORT),
                .tuple.dst.protonum     = IPPROTO_UDP,
                .help                   = ras_help,
                .expect_policy          = &ras_exp_policy,
@@ -1750,7 +1751,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_ras[] __read_mostly = {
                .name                   = "RAS",
                .me                     = THIS_MODULE,
                .tuple.src.l3num        = AF_INET6,
-               .tuple.src.u.udp.port   = __constant_htons(RAS_PORT),
+               .tuple.src.u.udp.port   = cpu_to_be16(RAS_PORT),
                .tuple.dst.protonum     = IPPROTO_UDP,
                .help                   = ras_help,
                .expect_policy          = &ras_exp_policy,