Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / net / netfilter / nf_conntrack_sane.c

diff --git a/net/netfilter/nf_conntrack_sane.c b/net/netfilter/nf_conntrack_sane.c
index eb2d1dc46d45286fe3e5667d2e8a64c22dff1cf5..355d371bac93d8bf1f7265d4cecdb7915cdc3157 100644 (file)
--- a/net/netfilter/nf_conntrack_sane.c
+++ b/net/netfilter/nf_conntrack_sane.c
@@ -40,12 +40,6 @@ static u_int16_t ports[MAX_PORTS];
 static unsigned int ports_c;
 module_param_array(ports, ushort, &ports_c, 0400);
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
 struct sane_request {
        __be32 RPC_code;
 #define SANE_NET_START      7   /* RPC code */
@@ -125,15 +119,15 @@ static int help(struct sk_buff **pskb,
        ct_sane_info->state = SANE_STATE_NORMAL;
 
        if (datalen < sizeof(struct sane_reply_net_start)) {
-               DEBUGP("nf_ct_sane: NET_START reply too short\n");
+               pr_debug("nf_ct_sane: NET_START reply too short\n");
                goto out;
        }
 
        reply = (struct sane_reply_net_start *)sb_ptr;
        if (reply->status != htonl(SANE_STATUS_SUCCESS)) {
                /* saned refused the command */
-               DEBUGP("nf_ct_sane: unsuccessful SANE_STATUS = %u\n",
-                       ntohl(reply->status));
+               pr_debug("nf_ct_sane: unsuccessful SANE_STATUS = %u\n",
+                        ntohl(reply->status));
                goto out;
        }
 
@@ -141,35 +135,32 @@ 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: ");
+       pr_debug("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)
@@ -178,9 +169,9 @@ static void nf_conntrack_sane_fini(void)
 
        for (i = 0; i < ports_c; i++) {
                for (j = 0; j < 2; j++) {
-                       DEBUGP("nf_ct_sane: unregistering helper for pf: %d "
-                              "port: %d\n",
-                               sane[i][j].tuple.src.l3num, ports[i]);
+                       pr_debug("nf_ct_sane: unregistering helper for pf: %d "
+                                "port: %d\n",
+                                sane[i][j].tuple.src.l3num, ports[i]);
                        nf_conntrack_helper_unregister(&sane[i][j]);
                }
        }
@@ -208,8 +199,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;
@@ -221,9 +210,9 @@ static int __init nf_conntrack_sane_init(void)
                                sprintf(tmpname, "sane-%d", ports[i]);
                        sane[i][j].name = tmpname;
 
-                       DEBUGP("nf_ct_sane: registering helper for pf: %d "
-                              "port: %d\n",
-                               sane[i][j].tuple.src.l3num, ports[i]);
+                       pr_debug("nf_ct_sane: registering helper for pf: %d "
+                                "port: %d\n",
+                                sane[i][j].tuple.src.l3num, ports[i]);
                        ret = nf_conntrack_helper_register(&sane[i][j]);
                        if (ret) {
                                printk(KERN_ERR "nf_ct_sane: failed to "