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

[cascardo/linux.git] / net / ipv4 / netfilter / nf_nat_h323.c

diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c
index ee47bf2..7e8e6fc 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@ -119,10 +119,9 @@ static int set_sig_addr(struct sk_buff *skb, struct nf_conn *ct,
                                    (ntohl(addr.ip) & 0xff000000) == 0x7f000000)
                                        i = 0;
 
-                               pr_debug("nf_nat_ras: set signal address "
-                                        "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                                        NIPQUAD(addr.ip), port,
-                                        NIPQUAD(ct->tuplehash[!dir].tuple.dst.u3.ip),
+                               pr_debug("nf_nat_ras: set signal address %pI4:%hu->%pI4:%hu\n",
+                                        &addr.ip, port,
+                                        &ct->tuplehash[!dir].tuple.dst.u3.ip,
                                         info->sig_port[!dir]);
                                return set_h225_addr(skb, data, 0, &taddr[i],
                                                     &ct->tuplehash[!dir].
@@ -131,10 +130,9 @@ static int set_sig_addr(struct sk_buff *skb, struct nf_conn *ct,
                        } else if (addr.ip == ct->tuplehash[dir].tuple.dst.u3.ip &&
                                   port == info->sig_port[dir]) {
                                /* GK->GW */
-                               pr_debug("nf_nat_ras: set signal address "
-                                        "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                                        NIPQUAD(addr.ip), port,
-                                        NIPQUAD(ct->tuplehash[!dir].tuple.src.u3.ip),
+                               pr_debug("nf_nat_ras: set signal address %pI4:%hu->%pI4:%hu\n",
+                                        &addr.ip, port,
+                                        &ct->tuplehash[!dir].tuple.src.u3.ip,
                                         info->sig_port[!dir]);
                                return set_h225_addr(skb, data, 0, &taddr[i],
                                                     &ct->tuplehash[!dir].
@@ -162,10 +160,9 @@ static int set_ras_addr(struct sk_buff *skb, struct nf_conn *ct,
                if (get_h225_addr(ct, *data, &taddr[i], &addr, &port) &&
                    addr.ip == ct->tuplehash[dir].tuple.src.u3.ip &&
                    port == ct->tuplehash[dir].tuple.src.u.udp.port) {
-                       pr_debug("nf_nat_ras: set rasAddress "
-                                "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                                NIPQUAD(addr.ip), ntohs(port),
-                                NIPQUAD(ct->tuplehash[!dir].tuple.dst.u3.ip),
+                       pr_debug("nf_nat_ras: set rasAddress %pI4:%hu->%pI4:%hu\n",
+                                &addr.ip, ntohs(port),
+                                &ct->tuplehash[!dir].tuple.dst.u3.ip,
                                 ntohs(ct->tuplehash[!dir].tuple.dst.u.udp.port));
                        return set_h225_addr(skb, data, 0, &taddr[i],
                                             &ct->tuplehash[!dir].tuple.dst.u3,
@@ -257,15 +254,15 @@ static int nat_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
        }
 
        /* Success */
-       pr_debug("nf_nat_h323: expect RTP %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(rtp_exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_h323: expect RTP %pI4:%hu->%pI4:%hu\n",
+                &rtp_exp->tuple.src.u3.ip,
                 ntohs(rtp_exp->tuple.src.u.udp.port),
-                NIPQUAD(rtp_exp->tuple.dst.u3.ip),
+                &rtp_exp->tuple.dst.u3.ip,
                 ntohs(rtp_exp->tuple.dst.u.udp.port));
-       pr_debug("nf_nat_h323: expect RTCP %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(rtcp_exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_h323: expect RTCP %pI4:%hu->%pI4:%hu\n",
+                &rtcp_exp->tuple.src.u3.ip,
                 ntohs(rtcp_exp->tuple.src.u.udp.port),
-                NIPQUAD(rtcp_exp->tuple.dst.u3.ip),
+                &rtcp_exp->tuple.dst.u3.ip,
                 ntohs(rtcp_exp->tuple.dst.u.udp.port));
 
        return 0;
@@ -307,10 +304,10 @@ static int nat_t120(struct sk_buff *skb, struct nf_conn *ct,
                return -1;
        }
 
-       pr_debug("nf_nat_h323: expect T.120 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_h323: expect T.120 %pI4:%hu->%pI4:%hu\n",
+                &exp->tuple.src.u3.ip,
                 ntohs(exp->tuple.src.u.tcp.port),
-                NIPQUAD(exp->tuple.dst.u3.ip),
+                &exp->tuple.dst.u3.ip,
                 ntohs(exp->tuple.dst.u.tcp.port));
 
        return 0;
@@ -361,10 +358,10 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,
                return -1;
        }
 
-       pr_debug("nf_nat_q931: expect H.245 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_q931: expect H.245 %pI4:%hu->%pI4:%hu\n",
+                &exp->tuple.src.u3.ip,
                 ntohs(exp->tuple.src.u.tcp.port),
-                NIPQUAD(exp->tuple.dst.u3.ip),
+                &exp->tuple.dst.u3.ip,
                 ntohs(exp->tuple.dst.u.tcp.port));
 
        return 0;
@@ -455,10 +452,10 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,
        }
 
        /* Success */
-       pr_debug("nf_nat_ras: expect Q.931 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_ras: expect Q.931 %pI4:%hu->%pI4:%hu\n",
+                &exp->tuple.src.u3.ip,
                 ntohs(exp->tuple.src.u.tcp.port),
-                NIPQUAD(exp->tuple.dst.u3.ip),
+                &exp->tuple.dst.u3.ip,
                 ntohs(exp->tuple.dst.u.tcp.port));
 
        return 0;
@@ -524,11 +521,10 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct,
        }
 
        /* Success */
-       pr_debug("nf_nat_q931: expect Call Forwarding "
-                "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n",
-                NIPQUAD(exp->tuple.src.u3.ip),
+       pr_debug("nf_nat_q931: expect Call Forwarding %pI4:%hu->%pI4:%hu\n",
+                &exp->tuple.src.u3.ip,
                 ntohs(exp->tuple.src.u.tcp.port),
-                NIPQUAD(exp->tuple.dst.u3.ip),
+                &exp->tuple.dst.u3.ip,
                 ntohs(exp->tuple.dst.u.tcp.port));
 
        return 0;