tty-usb-iuu-phoenix: Clean up to coding style

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_pptp.c

diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index 8fd83470d1b31aae6d8e552a664f95913d0aaa01..97e54b0e43a3a1825f58d4ec42d5bbf6aab0e2c4 100644 (file)
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -119,7 +119,7 @@ static void pptp_expectfn(struct nf_conn *ct,
                /* obviously this tuple inversion only works until you do NAT */
                nf_ct_invert_tuplepr(&inv_t, &exp->tuple);
                pr_debug("trying to unexpect other dir: ");
-               NF_CT_DUMP_TUPLE(&inv_t);
+               nf_ct_dump_tuple(&inv_t);
 
                exp_other = nf_ct_expect_find_get(&inv_t);
                if (exp_other) {
@@ -141,7 +141,7 @@ static int destroy_sibling_or_exp(const struct nf_conntrack_tuple *t)
        struct nf_conn *sibling;
 
        pr_debug("trying to timeout ct or exp for tuple ");
-       NF_CT_DUMP_TUPLE(t);
+       nf_ct_dump_tuple(t);
 
        h = nf_conntrack_find_get(t);
        if (h)  {
@@ -209,7 +209,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid)
        /* original direction, PNS->PAC */
        dir = IP_CT_DIR_ORIGINAL;
        nf_ct_expect_init(exp_orig, NF_CT_EXPECT_CLASS_DEFAULT,
-                         ct->tuplehash[dir].tuple.src.l3num,
+                         nf_ct_l3num(ct),
                          &ct->tuplehash[dir].tuple.src.u3,
                          &ct->tuplehash[dir].tuple.dst.u3,
                          IPPROTO_GRE, &peer_callid, &callid);
@@ -218,7 +218,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid)
        /* reply direction, PAC->PNS */
        dir = IP_CT_DIR_REPLY;
        nf_ct_expect_init(exp_reply, NF_CT_EXPECT_CLASS_DEFAULT,
-                         ct->tuplehash[dir].tuple.src.l3num,
+                         nf_ct_l3num(ct),
                          &ct->tuplehash[dir].tuple.src.u3,
                          &ct->tuplehash[dir].tuple.dst.u3,
                          IPPROTO_GRE, &callid, &peer_callid);