diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-28 19:08:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-28 19:08:13 -0400 |
| commit | 38ff4fa49bef77e86b21d95d9ce341a098f02839 (patch) | |
| tree | 9c1b370a8d81410296719325a9b8264200e1af72 /net/netfilter/ipvs/ip_vs_conn.c | |
| parent | 1afa67f5e70b4733d5b237df61e6d639af6283bb (diff) | |
netfilter: replace uses of NIP6_FMT with %p6
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_conn.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 9a24332fbed..89bf65be6f2 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c | |||
| @@ -820,13 +820,11 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v) | |||
| 820 | 820 | ||
| 821 | #ifdef CONFIG_IP_VS_IPV6 | 821 | #ifdef CONFIG_IP_VS_IPV6 |
| 822 | if (cp->af == AF_INET6) | 822 | if (cp->af == AF_INET6) |
| 823 | seq_printf(seq, | 823 | seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %7lu\n", |
| 824 | "%-3s " NIP6_FMT " %04X " NIP6_FMT | ||
| 825 | " %04X " NIP6_FMT " %04X %-11s %7lu\n", | ||
| 826 | ip_vs_proto_name(cp->protocol), | 824 | ip_vs_proto_name(cp->protocol), |
| 827 | NIP6(cp->caddr.in6), ntohs(cp->cport), | 825 | &cp->caddr.in6, ntohs(cp->cport), |
| 828 | NIP6(cp->vaddr.in6), ntohs(cp->vport), | 826 | &cp->vaddr.in6, ntohs(cp->vport), |
| 829 | NIP6(cp->daddr.in6), ntohs(cp->dport), | 827 | &cp->daddr.in6, ntohs(cp->dport), |
| 830 | ip_vs_state_name(cp->protocol, cp->state), | 828 | ip_vs_state_name(cp->protocol, cp->state), |
| 831 | (cp->timer.expires-jiffies)/HZ); | 829 | (cp->timer.expires-jiffies)/HZ); |
| 832 | else | 830 | else |
| @@ -883,13 +881,11 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v) | |||
| 883 | 881 | ||
| 884 | #ifdef CONFIG_IP_VS_IPV6 | 882 | #ifdef CONFIG_IP_VS_IPV6 |
| 885 | if (cp->af == AF_INET6) | 883 | if (cp->af == AF_INET6) |
| 886 | seq_printf(seq, | 884 | seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %-6s %7lu\n", |
| 887 | "%-3s " NIP6_FMT " %04X " NIP6_FMT | ||
| 888 | " %04X " NIP6_FMT " %04X %-11s %-6s %7lu\n", | ||
| 889 | ip_vs_proto_name(cp->protocol), | 885 | ip_vs_proto_name(cp->protocol), |
| 890 | NIP6(cp->caddr.in6), ntohs(cp->cport), | 886 | &cp->caddr.in6, ntohs(cp->cport), |
| 891 | NIP6(cp->vaddr.in6), ntohs(cp->vport), | 887 | &cp->vaddr.in6, ntohs(cp->vport), |
| 892 | NIP6(cp->daddr.in6), ntohs(cp->dport), | 888 | &cp->daddr.in6, ntohs(cp->dport), |
| 893 | ip_vs_state_name(cp->protocol, cp->state), | 889 | ip_vs_state_name(cp->protocol, cp->state), |
| 894 | ip_vs_origin_name(cp->flags), | 890 | ip_vs_origin_name(cp->flags), |
| 895 | (cp->timer.expires-jiffies)/HZ); | 891 | (cp->timer.expires-jiffies)/HZ); |