[NET]: Use NIP6_FMT in kernel.h

There are errors and inconsistency in the display of NIP6 strings.
	ie: net/ipv6/ip6_flowlabel.c

There are errors and inconsistency in the display of NIPQUAD strings too.
	ie: net/netfilter/nf_conntrack_ftp.c

This patch:
	adds NIP6_FMT to kernel.h
	changes all code to use NIP6_FMT
	fixes net/ipv6/ip6_flowlabel.c
	adds NIPQUAD_FMT to kernel.h
	fixes net/netfilter/nf_conntrack_ftp.c
	changes a few uses of "%u.%u.%u.%u" to NIPQUAD_FMT for symmetry to NIP6_FMT

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 11 insertions, 17 deletions

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 04c7fab4edc4..2e266129a764 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -180,8 +180,7 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport,
         }
 
         SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, "
-                          "src:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                          "dst:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                          "src:" NIP6_FMT " dst:" NIP6_FMT "\n",
                           __FUNCTION__, skb, skb->len,
                           NIP6(fl.fl6_src), NIP6(fl.fl6_dst));
 
@@ -206,13 +205,13 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
                 fl.oif = daddr->v6.sin6_scope_id;
         
 
-        SCTP_DEBUG_PRINTK("%s: DST=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ",
+        SCTP_DEBUG_PRINTK("%s: DST=" NIP6_FMT " ",
                           __FUNCTION__, NIP6(fl.fl6_dst));
 
         if (saddr) {
                 ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr);
                 SCTP_DEBUG_PRINTK(
-                        "SRC=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x - ",
+                        "SRC=" NIP6_FMT " - ",
                         NIP6(fl.fl6_src));
         }
 
@@ -221,8 +220,7 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
                 struct rt6_info *rt;
                 rt = (struct rt6_info *)dst;
                 SCTP_DEBUG_PRINTK(
-                        "rt6_dst:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                        "rt6_src:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                        "rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n",
                         NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr));
         } else {
                 SCTP_DEBUG_PRINTK("NO ROUTE\n");
@@ -271,13 +269,12 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
         __u8 bmatchlen;
 
         SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p "
-                          "daddr:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ",
+                          "daddr:" NIP6_FMT " ",
                           __FUNCTION__, asoc, dst, NIP6(daddr->v6.sin6_addr));
 
         if (!asoc) {
                 ipv6_get_saddr(dst, &daddr->v6.sin6_addr,&saddr->v6.sin6_addr);
-                SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: "
-                                  "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n",
                                   NIP6(saddr->v6.sin6_addr));
                 return;
         }
@@ -305,13 +302,11 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
 
         if (baddr) {
                 memcpy(saddr, baddr, sizeof(union sctp_addr));
-                SCTP_DEBUG_PRINTK("saddr: "
-                                  "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                SCTP_DEBUG_PRINTK("saddr: " NIP6_FMT "\n",
                                   NIP6(saddr->v6.sin6_addr));
         } else {
                 printk(KERN_ERR "%s: asoc:%p Could not find a valid source "
-                       "address for the "
-                       "dest:%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                       "address for the dest:" NIP6_FMT "\n",
                        __FUNCTION__, asoc, NIP6(daddr->v6.sin6_addr));
         }
 
@@ -675,8 +670,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb)
 /* Dump the v6 addr to the seq file. */
 static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr)
 {
-        seq_printf(seq, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x ",
-                   NIP6(addr->v6.sin6_addr));
+        seq_printf(seq, NIP6_FMT " ", NIP6(addr->v6.sin6_addr));
 }
 
 /* Initialize a PF_INET6 socket msg_name. */
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 557a7d90b92a..477d7f80dba6 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1036,14 +1036,14 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
                 if (from_addr.sa.sa_family == AF_INET6) {
                         printk(KERN_WARNING
                                "%s association %p could not find address "
-                               "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                               NIP6_FMT "\n",
                                __FUNCTION__,
                                asoc,
                                NIP6(from_addr.v6.sin6_addr));
                 } else {
                         printk(KERN_WARNING
                                "%s association %p could not find address "
-                               "%u.%u.%u.%u\n",
+                               NIPQUAD_FMT "\n",
                                __FUNCTION__,
                                asoc,
                                NIPQUAD(from_addr.v4.sin_addr.s_addr));