net: replace %#p6 format specifier with %pi6

gcc warns when using the # modifier with the %p format specifier,
so we can't use this to omit the colons when needed, introduces
%pi6 instead.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index ae4be823e493497e6035731ddd9e95108424b956..0e186cd20ad949e2b647e30f664ff517e741ab02 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -124,7 +124,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
                sprintf(dp, "ip4=" NIPQUAD_FMT,
                        NIPQUAD(server->addr.sockAddr.sin_addr));
        else if (server->addr.sockAddr.sin_family == AF_INET6)
-               sprintf(dp, "ip6=%#p6", &server->addr.sockAddr6.sin6_addr);
+               sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr);
        else
                goto out;
 

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 113c4d93153df33f9dd91b46ffe300217e20e05d..ff7ae05f72e15bdc9af230deff6c14bda7fa02f1 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2986,7 +2986,7 @@ static void if6_seq_stop(struct seq_file *seq, void *v)
 static int if6_seq_show(struct seq_file *seq, void *v)
 {
        struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
-       seq_printf(seq, "%#p6 %02x %02x %02x %02x %8s\n",
+       seq_printf(seq, "%pi6 %02x %02x %02x %02x %8s\n",
                   &ifp->addr,
                   ifp->idev->dev->ifindex,
                   ifp->prefix_len,

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index ae494e30e555522703f7c033cd125f975b9b24ce..1ae58bec1de08bf8cb860bb127a2e947d9b149f7 100644 (file)
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -512,7 +512,7 @@ static int ac6_seq_show(struct seq_file *seq, void *v)
        struct ifacaddr6 *im = (struct ifacaddr6 *)v;
        struct ac6_iter_state *state = ac6_seq_private(seq);
 
-       seq_printf(seq, "%-4d %-15s %#p6 %5d\n",
+       seq_printf(seq, "%-4d %-15s %pi6 %5d\n",
                   state->dev->ifindex, state->dev->name,
                   &im->aca_addr, im->aca_users);
        return 0;

diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index d571023535005ea208d46dc5a1e7c6f0ade0c506..7927a8498d17d3a91ad89e49a78a1bd838a6272c 100644 (file)
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -696,7 +696,7 @@ static int ip6fl_seq_show(struct seq_file *seq, void *v)
        else {
                struct ip6_flowlabel *fl = v;
                seq_printf(seq,
-                          "%05X %-1d %-6d %-6d %-6ld %-8ld %#p6 %-4d\n",
+                          "%05X %-1d %-6d %-6d %-6ld %-8ld %pi6 %-4d\n",
                           (unsigned)ntohl(fl->label),
                           fl->share,
                           (unsigned)fl->owner,

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 4416cdc3e627af50af5d7aeb4171e958eb1ac7de..a76199ecad23fae2688fca8223eb98633dab6e22 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2430,7 +2430,7 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)
        struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
        seq_printf(seq,
-                  "%-4d %-15s %#p6 %5d %08X %ld\n",
+                  "%-4d %-15s %pi6 %5d %08X %ld\n",
                   state->dev->ifindex, state->dev->name,
                   &im->mca_addr,
                   im->mca_users, im->mca_flags,
@@ -2591,7 +2591,7 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v)
                           "Source Address", "INC", "EXC");
        } else {
                seq_printf(seq,
-                          "%3d %6.6s %#p6 %#p6 %6lu %6lu\n",
+                          "%3d %6.6s %pi6 %pi6 %6lu %6lu\n",
                           state->dev->ifindex, state->dev->name,
                           &state->im->mca_addr,
                           &psf->sf_addr,

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 720bfedd318550ba5ecf2a938825f4c5573d2bc0..d69fa462d3f038fc346bb0ebcfc8aa40bac8a1c1 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2408,16 +2408,16 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
 {
        struct seq_file *m = p_arg;
 
-       seq_printf(m, "%#p6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
+       seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
 
 #ifdef CONFIG_IPV6_SUBTREES
-       seq_printf(m, "%#p6 %02x ", &rt->rt6i_src.addr, rt->rt6i_src.plen);
+       seq_printf(m, "%pi6 %02x ", &rt->rt6i_src.addr, rt->rt6i_src.plen);
 #else
        seq_puts(m, "00000000000000000000000000000000 00 ");
 #endif
 
        if (rt->rt6i_nexthop) {
-               seq_printf(m, "%#p6", rt->rt6i_nexthop->primary_key);
+               seq_printf(m, "%pi6", rt->rt6i_nexthop->primary_key);
        } else {
                seq_puts(m, "00000000000000000000000000000000");
        }

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 3498522389578a5f27c3f6088d7a4304bdb1ddf5..3c9aff584579fca2decf0f9b2a88f138c61c3c1a 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -365,7 +365,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
        buf = kzalloc(36, GFP_KERNEL);
        if (buf)
-               snprintf(buf, 36, "%#p6", &addr->sin6_addr);
+               snprintf(buf, 36, "%pi6", &addr->sin6_addr);
 
        xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;