[NETFILTER]: nf_conntrack: mark helpers __read_mostly

[pandora-kernel.git] / net / netfilter / nf_conntrack_sane.c

diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index eb2d1dc..627eda7 100644 (file)
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -141,35 +141,33 @@ static int help(struct sk_buff **pskb,
        if (reply->zero != 0)
                goto out;
 
-       exp = nf_conntrack_expect_alloc(ct);
+       exp = nf_ct_expect_alloc(ct);
        if (exp == NULL) {
                ret = NF_DROP;
                goto out;
        }
 
        tuple = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
-       nf_conntrack_expect_init(exp, family,
-                                &tuple->src.u3, &tuple->dst.u3,
-                                IPPROTO_TCP,
-                                NULL, &reply->port);
+       nf_ct_expect_init(exp, family, &tuple->src.u3, &tuple->dst.u3,
+                         IPPROTO_TCP, NULL, &reply->port);
 
        DEBUGP("nf_ct_sane: expect: ");
        NF_CT_DUMP_TUPLE(&exp->tuple);
        NF_CT_DUMP_TUPLE(&exp->mask);
 
        /* Can't expect this?  Best to drop packet now. */
-       if (nf_conntrack_expect_related(exp) != 0)
+       if (nf_ct_expect_related(exp) != 0)
                ret = NF_DROP;
 
-       nf_conntrack_expect_put(exp);
+       nf_ct_expect_put(exp);
 
 out:
        spin_unlock_bh(&nf_sane_lock);
        return ret;
 }
 
-static struct nf_conntrack_helper sane[MAX_PORTS][2];
-static char sane_names[MAX_PORTS][2][sizeof("sane-65535")];
+static struct nf_conntrack_helper sane[MAX_PORTS][2] __read_mostly;
+static char sane_names[MAX_PORTS][2][sizeof("sane-65535")] __read_mostly;
 
 /* don't make this __exit, since it's called from __init ! */
 static void nf_conntrack_sane_fini(void)
@@ -208,8 +206,6 @@ static int __init nf_conntrack_sane_init(void)
                for (j = 0; j < 2; j++) {
                        sane[i][j].tuple.src.u.tcp.port = htons(ports[i]);
                        sane[i][j].tuple.dst.protonum = IPPROTO_TCP;
-                       sane[i][j].mask.src.u.tcp.port = 0xFFFF;
-                       sane[i][j].mask.dst.protonum = 0xFF;
                        sane[i][j].max_expected = 1;
                        sane[i][j].timeout = 5 * 60;    /* 5 Minutes */
                        sane[i][j].me = THIS_MODULE;