diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 00:54:29 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 00:54:29 -0700 |
commit | 14d5e834f6b36667c7da56374645f99b6cf30814 (patch) | |
tree | 14bfecb3f5b7eaeec508e8d069265a0583d6be9f /net/netfilter/nf_conntrack_ftp.c | |
parent | 673d57e72398edfedc93fb50ff58048077c9d587 (diff) | |
download | linux-stable-14d5e834f6b36667c7da56374645f99b6cf30814.tar.gz linux-stable-14d5e834f6b36667c7da56374645f99b6cf30814.tar.bz2 linux-stable-14d5e834f6b36667c7da56374645f99b6cf30814.zip |
net: replace NIPQUAD() in net/netfilter/
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_ftp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c index 8cab6d595909..629500901bd4 100644 --- a/net/netfilter/nf_conntrack_ftp.c +++ b/net/netfilter/nf_conntrack_ftp.c @@ -462,10 +462,9 @@ static int help(struct sk_buff *skb, different IP address. Simply don't record it for NAT. */ if (cmd.l3num == PF_INET) { - pr_debug("conntrack_ftp: NOT RECORDING: " NIPQUAD_FMT - " != " NIPQUAD_FMT "\n", - NIPQUAD(cmd.u3.ip), - NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip)); + pr_debug("conntrack_ftp: NOT RECORDING: %pI4 != %pI4\n", + &cmd.u3.ip, + &ct->tuplehash[dir].tuple.src.u3.ip); } else { pr_debug("conntrack_ftp: NOT RECORDING: %pI6 != %pI6\n", cmd.u3.ip6, |