Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / ipv4 / netfilter / nf_nat_pptp.c

diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c
index 3a1e6d6afc0af3d8d2a7fda4cfc4a9e7bf290994..da3d91a5ef5ce70588732dabbcd5d8b613266e8c 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_pptp.c
+++ b/net/ipv4/netfilter/nf_nat_pptp.c
@@ -72,7 +72,7 @@ static void pptp_nat_expected(struct nf_conn *ct,
        }
 
        pr_debug("trying to unexpect other dir: ");
-       NF_CT_DUMP_TUPLE(&t);
+       nf_ct_dump_tuple_ip(&t);
        other_exp = nf_ct_expect_find_get(&t);
        if (other_exp) {
                nf_ct_unexpect_related(other_exp);