net: replace %p6 with %pI6

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

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 0a6472097a81eddd34121c69a80006bad67e2d0c..acb82aff8808d6cf40e9a9a5b18e4454c99c1486 100644 (file)
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -290,7 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
                /*
                 * IPv6
                 */
-               str += sprintf(str, "%p6", ip);
+               str += sprintf(str, "%pI6", ip);
        }
        str += sprintf(str, "\n");
        return str - buf;

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index e985193d631c1d59eec522586bfdc886fdb73d17..4f4d1bb9f069fa6a8f61c0027eb1f07c377d3664 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -262,7 +262,7 @@ static ssize_t show_port_gid(struct ib_port *p, struct port_attribute *attr,
        if (ret)
                return ret;
 
-       return sprintf(buf, "%p6\n", gid.raw);
+       return sprintf(buf, "%pI6\n", gid.raw);
 }
 
 static ssize_t show_port_pkey(struct ib_port *p, struct port_attribute *attr,

diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 693bed0b2d1cef8d1269900f5396017cbaa8c317..d4c81053e439fe0fa46bae57e42e92738792b9e6 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -87,7 +87,7 @@ static int find_mgm(struct mthca_dev *dev,
        }
 
        if (0)
-               mthca_dbg(dev, "Hash for %p6 is %04x\n", gid, *hash);
+               mthca_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
        *index = *hash;
        *prev  = -1;
@@ -254,7 +254,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                goto out;
 
        if (index == -1) {
-               mthca_err(dev, "MGID %p6 not found\n", gid->raw);
+               mthca_err(dev, "MGID %pI6 not found\n", gid->raw);
                err = -EINVAL;
                goto out;
        }

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index d98d87bfe365ddcfebbd84f680980c2620ea0dc2..47d588ba2a7f73e830c249b7546c441c93e26fcf 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1128,7 +1128,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
                goto err_send_cm;
        }
 
-       ipoib_dbg(priv, "Request connection 0x%x for gid %p6 qpn 0x%x\n",
+       ipoib_dbg(priv, "Request connection 0x%x for gid %pI6 qpn 0x%x\n",
                  p->qp->qp_num, pathrec->dgid.raw, qpn);
 
        return 0;
@@ -1276,7 +1276,7 @@ void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx)
        if (test_and_clear_bit(IPOIB_FLAG_INITIALIZED, &tx->flags)) {
                list_move(&tx->list, &priv->cm.reap_list);
                queue_work(ipoib_workqueue, &priv->cm.reap_task);
-               ipoib_dbg(priv, "Reap connection for gid %p6\n",
+               ipoib_dbg(priv, "Reap connection for gid %pI6\n",
                          tx->neigh->dgid.raw);
                tx->neigh = NULL;
        }

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index e7f4f94c3e9291ab212ddf7a268ab62bc472abcb..b3a671895bdc52dbfa2f17cfd2ff56dc22f6b048 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -359,7 +359,7 @@ void ipoib_mark_paths_invalid(struct net_device *dev)
        spin_lock_irq(&priv->lock);
 
        list_for_each_entry_safe(path, tp, &priv->path_list, list) {
-               ipoib_dbg(priv, "mark path LID 0x%04x GID %p6 invalid\n",
+               ipoib_dbg(priv, "mark path LID 0x%04x GID %pI6 invalid\n",
                        be16_to_cpu(path->pathrec.dlid),
                        path->pathrec.dgid.raw);
                path->valid =  0;
@@ -413,10 +413,10 @@ static void path_rec_completion(int status,
        unsigned long flags;
 
        if (!status)
-               ipoib_dbg(priv, "PathRec LID 0x%04x for GID %p6\n",
+               ipoib_dbg(priv, "PathRec LID 0x%04x for GID %pI6\n",
                          be16_to_cpu(pathrec->dlid), pathrec->dgid.raw);
        else
-               ipoib_dbg(priv, "PathRec status %d for GID %p6\n",
+               ipoib_dbg(priv, "PathRec status %d for GID %pI6\n",
                          status, path->pathrec.dgid.raw);
 
        skb_queue_head_init(&skqueue);
@@ -527,7 +527,7 @@ static int path_rec_start(struct net_device *dev,
 {
        struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-       ipoib_dbg(priv, "Start path record lookup for %p6\n",
+       ipoib_dbg(priv, "Start path record lookup for %pI6\n",
                  path->pathrec.dgid.raw);
 
        init_completion(&path->done);
@@ -764,7 +764,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                        if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
                            (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
-                               ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %p6\n",
+                               ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
                                           skb->dst ? "neigh" : "dst",
                                           be16_to_cpup((__be16 *) skb->data),
                                           IPOIB_QPN(phdr->hwaddr),
@@ -844,7 +844,7 @@ static void ipoib_neigh_cleanup(struct neighbour *n)
        else
                return;
        ipoib_dbg(priv,
-                 "neigh_cleanup for %06x %p6\n",
+                 "neigh_cleanup for %06x %pI6\n",
                  IPOIB_QPN(n->ha),
                  n->ha + 4);
 

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 0de79cf4c07cbfc43a4d068e75eb074d7ea33acd..a2eb3b9789ebabb08f69f3b0421128900db22bd6 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -71,7 +71,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
        struct ipoib_neigh *neigh, *tmp;
        int tx_dropped = 0;
 
-       ipoib_dbg_mcast(netdev_priv(dev), "deleting multicast group %p6\n",
+       ipoib_dbg_mcast(netdev_priv(dev), "deleting multicast group %pI6\n",
                        mcast->mcmember.mgid.raw);
 
        spin_lock_irq(&priv->lock);
@@ -204,7 +204,7 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
 
        if (!test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
                if (test_and_set_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) {
-                       ipoib_warn(priv, "multicast group %p6 already attached\n",
+                       ipoib_warn(priv, "multicast group %pI6 already attached\n",
                                   mcast->mcmember.mgid.raw);
 
                        return 0;
@@ -213,7 +213,7 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
                ret = ipoib_mcast_attach(dev, be16_to_cpu(mcast->mcmember.mlid),
                                         &mcast->mcmember.mgid, set_qkey);
                if (ret < 0) {
-                       ipoib_warn(priv, "couldn't attach QP to multicast group %p6\n",
+                       ipoib_warn(priv, "couldn't attach QP to multicast group %pI6\n",
                                   mcast->mcmember.mgid.raw);
 
                        clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags);
@@ -245,7 +245,7 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
                        mcast->ah = ah;
                        spin_unlock_irq(&priv->lock);
 
-                       ipoib_dbg_mcast(priv, "MGID %p6 AV %p, LID 0x%04x, SL %d\n",
+                       ipoib_dbg_mcast(priv, "MGID %pI6 AV %p, LID 0x%04x, SL %d\n",
                                        mcast->mcmember.mgid.raw,
                                        mcast->ah->ah,
                                        be16_to_cpu(mcast->mcmember.mlid),
@@ -291,7 +291,7 @@ ipoib_mcast_sendonly_join_complete(int status,
 
        if (status) {
                if (mcast->logcount++ < 20)
-                       ipoib_dbg_mcast(netdev_priv(dev), "multicast join failed for %p6, status %d\n",
+                       ipoib_dbg_mcast(netdev_priv(dev), "multicast join failed for %pI6, status %d\n",
                                        mcast->mcmember.mgid.raw, status);
 
                /* Flush out any queued packets */
@@ -351,7 +351,7 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)
                ipoib_warn(priv, "ib_sa_join_multicast failed (ret = %d)\n",
                           ret);
        } else {
-               ipoib_dbg_mcast(priv, "no multicast record for %p6, starting join\n",
+               ipoib_dbg_mcast(priv, "no multicast record for %pI6, starting join\n",
                                mcast->mcmember.mgid.raw);
        }
 
@@ -380,7 +380,7 @@ static int ipoib_mcast_join_complete(int status,
        struct net_device *dev = mcast->dev;
        struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-       ipoib_dbg_mcast(priv, "join completion for %p6 (status %d)\n",
+       ipoib_dbg_mcast(priv, "join completion for %pI6 (status %d)\n",
                        mcast->mcmember.mgid.raw, status);
 
        /* We trap for port events ourselves. */
@@ -410,10 +410,10 @@ static int ipoib_mcast_join_complete(int status,
 
        if (mcast->logcount++ < 20) {
                if (status == -ETIMEDOUT) {
-                       ipoib_dbg_mcast(priv, "multicast join failed for %p6, status %d\n",
+                       ipoib_dbg_mcast(priv, "multicast join failed for %pI6, status %d\n",
                                        mcast->mcmember.mgid.raw, status);
                } else {
-                       ipoib_warn(priv, "multicast join failed for %p6, status %d\n",
+                       ipoib_warn(priv, "multicast join failed for %pI6, status %d\n",
                                   mcast->mcmember.mgid.raw, status);
                }
        }
@@ -446,7 +446,7 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast,
        ib_sa_comp_mask comp_mask;
        int ret = 0;
 
-       ipoib_dbg_mcast(priv, "joining MGID %p6\n", mcast->mcmember.mgid.raw);
+       ipoib_dbg_mcast(priv, "joining MGID %pI6\n", mcast->mcmember.mgid.raw);
 
        rec.mgid     = mcast->mcmember.mgid;
        rec.port_gid = priv->local_gid;
@@ -631,7 +631,7 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
                ib_sa_free_multicast(mcast->mc);
 
        if (test_and_clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) {
-               ipoib_dbg_mcast(priv, "leaving MGID %p6\n",
+               ipoib_dbg_mcast(priv, "leaving MGID %pI6\n",
                                mcast->mcmember.mgid.raw);
 
                /* Remove ourselves from the multicast group */
@@ -663,7 +663,7 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
        mcast = __ipoib_mcast_find(dev, mgid);
        if (!mcast) {
                /* Let's create a new send only group now */
-               ipoib_dbg_mcast(priv, "setting up send only multicast group for %p6\n",
+               ipoib_dbg_mcast(priv, "setting up send only multicast group for %pI6\n",
                                mgid);
 
                mcast = ipoib_mcast_alloc(dev, 0);
@@ -797,13 +797,13 @@ void ipoib_mcast_restart_task(struct work_struct *work)
                        /* ignore group which is directly joined by userspace */
                        if (test_bit(IPOIB_FLAG_UMCAST, &priv->flags) &&
                            !ib_sa_get_mcmember_rec(priv->ca, priv->port, &mgid, &rec)) {
-                               ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid %p6\n",
+                               ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid %pI6\n",
                                                mgid.raw);
                                continue;
                        }
 
                        /* Not found or send-only group, let's add a new entry */
-                       ipoib_dbg_mcast(priv, "adding multicast entry for mgid %p6\n",
+                       ipoib_dbg_mcast(priv, "adding multicast entry for mgid %pI6\n",
                                        mgid.raw);
 
                        nmcast = ipoib_mcast_alloc(dev, 0);
@@ -837,7 +837,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
        list_for_each_entry_safe(mcast, tmcast, &priv->multicast_list, list) {
                if (!test_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags) &&
                    !test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
-                       ipoib_dbg_mcast(priv, "deleting multicast group %p6\n",
+                       ipoib_dbg_mcast(priv, "deleting multicast group %pI6\n",
                                        mcast->mcmember.mgid.raw);
 
                        rb_erase(&mcast->rb_node, &priv->multicast_tree);

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index bc825310c6db9c9cb973eaf7e7c075e84bc2b5f1..7c13db885bf67defc836d8d60552865ff0041a62 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1514,7 +1514,7 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
            target->state == SRP_TARGET_REMOVED)
                return -ENODEV;
 
-       return sprintf(buf, "%p6\n", target->path.dgid.raw);
+       return sprintf(buf, "%pI6\n", target->path.dgid.raw);
 }
 
 static ssize_t show_orig_dgid(struct device *dev,
@@ -1526,7 +1526,7 @@ static ssize_t show_orig_dgid(struct device *dev,
            target->state == SRP_TARGET_REMOVED)
                return -ENODEV;
 
-       return sprintf(buf, "%p6\n", target->orig_dgid);
+       return sprintf(buf, "%pI6\n", target->orig_dgid);
 }
 
 static ssize_t show_zero_req_lim(struct device *dev,
@@ -1867,7 +1867,7 @@ static ssize_t srp_create_target(struct device *dev,
 
        shost_printk(KERN_DEBUG, target->scsi_host, PFX
                     "new target: id_ext %016llx ioc_guid %016llx pkey %04x "
-                    "service_id %016llx dgid %p6\n",
+                    "service_id %016llx dgid %pI6\n",
               (unsigned long long) be64_to_cpu(target->id_ext),
               (unsigned long long) be64_to_cpu(target->ioc_guid),
               be16_to_cpu(target->path.pkey),

diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 6f79e84a5c9a256fb13e80712b55e90ad059e272..b1622062b12db496cf5349fb13dcfc22d42d1a7f 100644 (file)
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -118,7 +118,7 @@ static int find_mgm(struct mlx4_dev *dev,
                return err;
 
        if (0)
-               mlx4_dbg(dev, "Hash for %p6 is %04x\n", gid, *hash);
+               mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
        *index = *hash;
        *prev  = -1;
@@ -267,7 +267,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
                goto out;
 
        if (index == -1) {
-               mlx4_err(dev, "MGID %p6 not found\n", gid);
+               mlx4_err(dev, "MGID %pI6 not found\n", gid);
                err = -EINVAL;
                goto out;
        }

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index ef929aef7c12028a7c6ff032fc267691a26e2a40..24d09028a27f1503633060aacdba43fabd5e6686 100644 (file)
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
        case AF_INET6:
                sin6 = (struct sockaddr_in6 *)addr;
                spin_lock_bh(&conn->session->lock);
-               sprintf(buf, "%p6", &sin6->sin6_addr);
+               sprintf(buf, "%pI6", &sin6->sin6_addr);
                *port = be16_to_cpu(sin6->sin6_port);
                spin_unlock_bh(&conn->session->lock);
                break;

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 344e6b475e05b07fb5b20bb406031f6513d1f81e..c8ab7d70390dcc48da2858c441d59998a7fbc5ce 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -122,7 +122,7 @@ static void nlm_display_address(const struct sockaddr *sap,
                        snprintf(buf, len, NIPQUAD_FMT,
                                 NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
                else
-                       snprintf(buf, len, "%p6", &sin6->sin6_addr);
+                       snprintf(buf, len, "%pI6", &sin6->sin6_addr);
                break;
        default:
                snprintf(buf, len, "unsupported address family");

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 5fe77219df78eb727e1d2a1ab32a35592dec8286..eb391d8d70ba023f94d9212d585f64f19abd27ab 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -468,7 +468,7 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
        }
        case AF_INET6: {
                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
-               seq_printf(m, ",mountaddr=%p6", &sin6->sin6_addr);
+               seq_printf(m, ",mountaddr=%pI6", &sin6->sin6_addr);
                break;
        }
        default:

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 42e01c93c7ea1bc138d94314977efb6ffa88cf9d..51cb75ea42d57367b37403e1d02f2f6399a4a7ab 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -145,7 +145,7 @@ static inline char *__svc_print_addr(struct sockaddr *addr,
                break;
 
        case AF_INET6:
-               snprintf(buf, len, "%p6, port=%u",
+               snprintf(buf, len, "%pI6, port=%u",
                         &((struct sockaddr_in6 *)addr)->sin6_addr,
                        ntohs(((struct sockaddr_in6 *) addr)->sin6_port));
                break;

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 6a6692067092abb12bfee93c7ee6b96827e79097..af48cada561e5089932f4246e265df0792c0e1f9 100644 (file)
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -87,7 +87,7 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
        int len;
 #ifdef CONFIG_IP_VS_IPV6
        if (af == AF_INET6)
-               len = snprintf(&buf[*idx], buf_len - *idx, "[%p6]",
+               len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6]",
                               &addr->in6) + 1;
        else
 #endif

diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 303efaf68d0812f6bb58e8934253d47a5cae700c..42f1fc96f3ec34cbc83603032818b95e82c8fed8 100644 (file)
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -122,7 +122,7 @@ static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
 static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-       printk("tuple %p: %u %p6 %hu -> %p6 %hu\n",
+       printk("tuple %p: %u %pI6 %hu -> %pI6 %hu\n",
               t, t->dst.protonum,
               t->src.u3.all, ntohs(t->src.u.all),
               t->dst.u3.all, ntohs(t->dst.u.all));

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index a84c3976e1b0e38d9a60a1b8aedce01e036b7387..e71b0f7ce88edec17ec7a672442b16b6abdf13a6 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -285,7 +285,7 @@ extern int sctp_debug_flag;
        if (sctp_debug_flag) { \
                if (saddr->sa.sa_family == AF_INET6) { \
                        printk(KERN_DEBUG \
-                              lead "%p6" trail, \
+                              lead "%pI6" trail, \
                               leadparm, \
                               &saddr->v6.sin6_addr, \
                               otherparms); \

diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 3654f3ebdb8fec01cbd95e74cb275d0dfde0b216..5e7cff3542f2feacf56002af32cfc85d68505fb0 100644 (file)
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -133,7 +133,7 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
                        printk(" INCOMPLETE IPv6 header");
                        goto out;
                }
-               printk(" IPv6 SRC=%p6 IPv6 DST=%p6, IPv6 priority=0x%01X, Next Header=%d",
+               printk(" IPv6 SRC=%pI6 IPv6 DST=%pI6, IPv6 priority=0x%01X, Next Header=%d",
                       &ih->saddr, &ih->daddr, ih->priority, ih->nexthdr);
                nexthdr = ih->nexthdr;
                offset_ph = ipv6_skip_exthdr(skb, sizeof(_iph), &nexthdr);

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 191c06bb0f67a6bd9419cb5b58fd05a28e75089e..04909e4b3c4c9980cc7c89785c268e59467a9e6c 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2346,7 +2346,7 @@ static void DBGUNDO(struct sock *sk, const char *msg)
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        else if (sk->sk_family == AF_INET6) {
                struct ipv6_pinfo *np = inet6_sk(sk);
-               printk(KERN_DEBUG "Undo %s %p6/%u c%u l%u ss%u/%u p%u\n",
+               printk(KERN_DEBUG "Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n",
                       msg,
                       &np->daddr, ntohs(inet->dport),
                       tp->snd_cwnd, tcp_left_out(tp),

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 4e6ee5205237e461408ed8cf3e65089c29bc04a3..979c9d604eb089d50702b088e04ccd9c612acf7b 100644 (file)
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -306,7 +306,7 @@ static void tcp_retransmit_timer(struct sock *sk)
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
                else if (sk->sk_family == AF_INET6) {
                        struct ipv6_pinfo *np = inet6_sk(sk);
-                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer %p6:%u/%u shrinks window %u:%u. Repaired.\n",
+                       LIMIT_NETDEBUG(KERN_DEBUG "TCP: Treason uncloaked! Peer %pI6:%u/%u shrinks window %u:%u. Repaired.\n",
                               &np->daddr, ntohs(inet->dport),
                               inet->num, tp->snd_una, tp->snd_nxt);
                }

diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index d28036659d27325d4e4ef1d20e18c696128bfedc..6ff73c4c126aeabc14e102df05d879f4463825e9 100644 (file)
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -186,7 +186,7 @@ u32 ipv6_addr_label(struct net *net,
        label = p ? p->label : IPV6_ADDR_LABEL_DEFAULT;
        rcu_read_unlock();
 
-       ADDRLABEL(KERN_DEBUG "%s(addr=%p6, type=%d, ifindex=%d) => %08x\n",
+       ADDRLABEL(KERN_DEBUG "%s(addr=%pI6, type=%d, ifindex=%d) => %08x\n",
                  __func__, addr, type, ifindex, label);
 
        return label;
@@ -201,7 +201,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
        struct ip6addrlbl_entry *newp;
        int addrtype;
 
-       ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d, label=%u)\n",
+       ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u)\n",
                  __func__, prefix, prefixlen, ifindex, (unsigned int)label);
 
        addrtype = ipv6_addr_type(prefix) & (IPV6_ADDR_MAPPED | IPV6_ADDR_COMPATv4 | IPV6_ADDR_LOOPBACK);
@@ -289,7 +289,7 @@ static int ip6addrlbl_add(struct net *net,
        struct ip6addrlbl_entry *newp;
        int ret = 0;
 
-       ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",
+       ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d, label=%u, replace=%d)\n",
                  __func__, prefix, prefixlen, ifindex, (unsigned int)label,
                  replace);
 
@@ -313,7 +313,7 @@ static int __ip6addrlbl_del(struct net *net,
        struct hlist_node *pos, *n;
        int ret = -ESRCH;
 
-       ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d)\n",
+       ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",
                  __func__, prefix, prefixlen, ifindex);
 
        hlist_for_each_entry_safe(p, pos, n, &ip6addrlbl_table.head, list) {
@@ -337,7 +337,7 @@ static int ip6addrlbl_del(struct net *net,
        struct in6_addr prefix_buf;
        int ret;
 
-       ADDRLABEL(KERN_DEBUG "%s(prefix=%p6, prefixlen=%d, ifindex=%d)\n",
+       ADDRLABEL(KERN_DEBUG "%s(prefix=%pI6, prefixlen=%d, ifindex=%d)\n",
                  __func__, prefix, prefixlen, ifindex);
 
        ipv6_addr_prefix(&prefix_buf, prefix, prefixlen);

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 9bc43f2527cebf9ef575e1b412919a376d4a063f..7a8a01369e5ca2a7fdd9d01888d7d336d9117a74 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -419,7 +419,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (!x)
                return;
 
-       NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/%p6\n",
+       NETDEBUG(KERN_DEBUG "pmtu discovery on SA AH/%08x/%pI6\n",
                 ntohl(ah->spi), &iph->daddr);
 
        xfrm_state_put(x);

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index ec4be188c341ebb96e3cdef68e5c7b5f23de2e02..c02a6308defe6c98936fb045626ab61eed93f17a 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -367,7 +367,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, esph->spi, IPPROTO_ESP, AF_INET6);
        if (!x)
                return;
-       printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%p6\n",
+       printk(KERN_DEBUG "pmtu discovery on SA ESP/%08x/%pI6\n",
                        ntohl(esph->spi), &iph->daddr);
        xfrm_state_put(x);
 }

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index a89051468359718ba9d87f80c969c646b9853a6d..1c7f400a3cfe5d58e95233de5a785b293d2fbeae 100644 (file)
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -219,7 +219,7 @@ static int ipv6_dest_hao(struct sk_buff *skb, int optoff)
 
        if (!(ipv6_addr_type(&hao->addr) & IPV6_ADDR_UNICAST)) {
                LIMIT_NETDEBUG(
-                       KERN_DEBUG "hao is not an unicast addr: %p6\n", &hao->addr);
+                       KERN_DEBUG "hao is not an unicast addr: %pI6\n", &hao->addr);
                goto discard;
        }
 

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index b3fa38e40dc43e8db87b2a20a2d32ba3affde515..3c2821f9b5290a1f976ae369c2143ae907f2ed7c 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -681,7 +681,7 @@ static int icmpv6_rcv(struct sk_buff *skb)
                skb->csum = ~csum_unfold(csum_ipv6_magic(saddr, daddr, skb->len,
                                             IPPROTO_ICMPV6, 0));
                if (__skb_checksum_complete(skb)) {
-                       LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [%p6 > %p6]\n",
+                       LIMIT_NETDEBUG(KERN_DEBUG "ICMPv6 checksum failed [%pI6 > %pI6]\n",
                                       saddr, daddr);
                        goto discard_it;
                }

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 798e6a29dd83ddb17b85e431ca2113e87c1fa853..c491fb98a5e31451cd66b0f77c2009cc20b607f1 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -297,7 +297,7 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
                const struct mfc6_cache *mfc = v;
                const struct ipmr_mfc_iter *it = seq->private;
 
-               seq_printf(seq, "%p6 %p6 %-3d %8ld %8ld %8ld",
+               seq_printf(seq, "%pI6 %pI6 %-3d %8ld %8ld %8ld",
                           &mfc->mf6c_mcastgrp, &mfc->mf6c_origin,
                           mfc->mf6c_parent,
                           mfc->mfc_un.res.pkt,

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 9566d8f73140c88ee40d2709b40010689915c08b..d4576a9c154f040334bde597122f9a838f315dd7 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -67,7 +67,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        if (!x)
                return;
 
-       printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%p6\n",
+       printk(KERN_DEBUG "pmtu discovery on SA IPCOMP/%08x/%pI6\n",
                        spi, &iph->daddr);
        xfrm_state_put(x);
 }

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 191bb0722a7cf91b551e91fc18a9fbf4310cff02..2a6752dae09d9376b59a1b2de0179b666a174cdc 100644 (file)
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -647,7 +647,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
 
        if ((probes -= neigh->parms->ucast_probes) < 0) {
                if (!(neigh->nud_state & NUD_VALID)) {
-                       ND_PRINTK1(KERN_DEBUG "%s(): trying to ucast probe in NUD_INVALID: %p6\n",
+                       ND_PRINTK1(KERN_DEBUG "%s(): trying to ucast probe in NUD_INVALID: %pI6\n",
                                   __func__, target);
                }
                ndisc_send_ns(dev, neigh, target, target, saddr);

diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index a61ce3010007818d6b9b736fd36aeb09faa2eead..02885e8bb69bef025a0a3207a381c604de651a54 100644 (file)
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -61,7 +61,7 @@ static void dump_packet(const struct nf_loginfo *info,
        }
 
        /* Max length: 88 "SRC=0000.0000.0000.0000.0000.0000.0000.0000 DST=0000.0000.0000.0000.0000.0000.0000.0000 " */
-       printk("SRC=%p6 DST=%p6 ", &ih->saddr, &ih->daddr);
+       printk("SRC=%pI6 DST=%pI6 ", &ih->saddr, &ih->daddr);
 
        /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
        printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index b165a273c6c048c50c680a334f9410873e6960f8..727b9530448a5fd42562a8163eaadc067da4b5d6 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -56,7 +56,7 @@ static bool ipv6_invert_tuple(struct nf_conntrack_tuple *tuple,
 static int ipv6_print_tuple(struct seq_file *s,
                            const struct nf_conntrack_tuple *tuple)
 {
-       return seq_printf(s, "src=%p6 dst=%p6 ",
+       return seq_printf(s, "src=%pI6 dst=%pI6 ",
                          tuple->src.u3.ip6, tuple->dst.u3.ip6);
 }
 

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 483550cfdf338afc4e13f1caafd83fcc5c231cf5..984276463a8ddf709e10c56c284ad85fc17e8fd1 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -872,7 +872,7 @@ static int tcp_v6_inbound_md5_hash (struct sock *sk, struct sk_buff *skb)
 
        if (genhash || memcmp(hash_location, newhash, 16) != 0) {
                if (net_ratelimit()) {
-                       printk(KERN_INFO "MD5 Hash %s for (%p6, %u)->(%p6, %u)\n",
+                       printk(KERN_INFO "MD5 Hash %s for (%pI6, %u)->(%pI6, %u)\n",
                               genhash ? "failed" : "mismatch",
                               &ip6h->saddr, ntohs(th->source),
                               &ip6h->daddr, ntohs(th->dest));

diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 89bf65be6f2ccb41a4b837f70dfeb7263044c5b1..60aba45023ff7e9d687d356c1aaf4edfebde7e2d 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -820,7 +820,7 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v)
 
 #ifdef CONFIG_IP_VS_IPV6
                if (cp->af == AF_INET6)
-                       seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %7lu\n",
+                       seq_printf(seq, "%-3s %pI6 %04X %pI6 %04X %pI6 %04X %-11s %7lu\n",
                                ip_vs_proto_name(cp->protocol),
                                &cp->caddr.in6, ntohs(cp->cport),
                                &cp->vaddr.in6, ntohs(cp->vport),
@@ -881,7 +881,7 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v)
 
 #ifdef CONFIG_IP_VS_IPV6
                if (cp->af == AF_INET6)
-                       seq_printf(seq, "%-3s %p6 %04X %p6 %04X %p6 %04X %-11s %-6s %7lu\n",
+                       seq_printf(seq, "%-3s %pI6 %04X %pI6 %04X %pI6 %04X %-11s %-6s %7lu\n",
                                ip_vs_proto_name(cp->protocol),
                                &cp->caddr.in6, ntohs(cp->cport),
                                &cp->vaddr.in6, ntohs(cp->vport),

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 9400587a01e70c59737ad66914a4f578f844e379..c3c68443b5b16f54a0120970df66c6e4e4504f10 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -805,7 +805,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related)
        if (ic == NULL)
                return NF_DROP;
 
-       IP_VS_DBG(12, "Outgoing ICMPv6 (%d,%d) %p6->%p6\n",
+       IP_VS_DBG(12, "Outgoing ICMPv6 (%d,%d) %pI6->%pI6\n",
                  ic->icmp6_type, ntohs(icmpv6_id(ic)),
                  &iph->saddr, &iph->daddr);
 
@@ -1175,7 +1175,7 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum)
        if (ic == NULL)
                return NF_DROP;
 
-       IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) %p6->%p6\n",
+       IP_VS_DBG(12, "Incoming ICMPv6 (%d,%d) %pI6->%pI6\n",
                  ic->icmp6_type, ntohs(icmpv6_id(ic)),
                  &iph->saddr, &iph->daddr);
 

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 28c47c0d51424a9c387f0e0885f0b4710bdf9e06..76db27ec96335543a9980caba898304080baa64a 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1867,7 +1867,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
                if (iter->table == ip_vs_svc_table) {
 #ifdef CONFIG_IP_VS_IPV6
                        if (svc->af == AF_INET6)
-                               seq_printf(seq, "%s  [%p6]:%04X %s ",
+                               seq_printf(seq, "%s  [%pI6]:%04X %s ",
                                           ip_vs_proto_name(svc->protocol),
                                           &svc->addr.in6,
                                           ntohs(svc->port),
@@ -1895,7 +1895,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
 #ifdef CONFIG_IP_VS_IPV6
                        if (dest->af == AF_INET6)
                                seq_printf(seq,
-                                          "  -> [%p6]:%04X"
+                                          "  -> [%pI6]:%04X"
                                           "      %-7s %-6d %-10d %-10d\n",
                                           &dest->addr.in6,
                                           ntohs(dest->port),

diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index d7ce4f1839c9241508dceac825d861979e257258..54cd67fbfe743af09dde6a899ab9ef16f9072562 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -203,7 +203,7 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp,
        if (ih == NULL)
                sprintf(buf, "%s TRUNCATED", pp->name);
        else if (ih->nexthdr == IPPROTO_FRAGMENT)
-               sprintf(buf, "%s %p6->%p6 frag",
+               sprintf(buf, "%s %pI6->%pI6 frag",
                        pp->name, &ih->saddr, &ih->daddr);
        else {
                __be16 _ports[2], *pptr;
@@ -211,10 +211,10 @@ ip_vs_tcpudp_debug_packet_v6(struct ip_vs_protocol *pp,
                pptr = skb_header_pointer(skb, offset + sizeof(struct ipv6hdr),
                                          sizeof(_ports), _ports);
                if (pptr == NULL)
-                       sprintf(buf, "%s TRUNCATED %p6->%p6",
+                       sprintf(buf, "%s TRUNCATED %pI6->%pI6",
                                pp->name, &ih->saddr, &ih->daddr);
                else
-                       sprintf(buf, "%s %p6:%u->%p6:%u",
+                       sprintf(buf, "%s %pI6:%u->%pI6:%u",
                                pp->name,
                                &ih->saddr, ntohs(pptr[0]),
                                &ih->daddr, ntohs(pptr[1]));

diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 59f2d11b683e2572f8e4d4c7ca8693c4f9253933..6ede88812044f312f3bc9064f75e8b3ac077d357 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
@@ -154,7 +154,7 @@ ah_esp_debug_packet_v6(struct ip_vs_protocol *pp, const struct sk_buff *skb,
        if (ih == NULL)
                sprintf(buf, "%s TRUNCATED", pp->name);
        else
-               sprintf(buf, "%s %p6->%p6",
+               sprintf(buf, "%s %pI6->%pI6",
                        pp->name, &ih->saddr, &ih->daddr);
 
        printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);

diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index be34c335cabed8f147c272d15cf28d9bf53e5914..fc342dda950a654e2068d1e68f4657971259a102 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -141,12 +141,12 @@ __ip_vs_get_out_rt_v6(struct ip_vs_conn *cp)
                                                                 NULL, &fl);
                        if (!rt) {
                                spin_unlock(&dest->dst_lock);
-                               IP_VS_DBG_RL("ip6_route_output error, dest: %p6\n",
+                               IP_VS_DBG_RL("ip6_route_output error, dest: %pI6\n",
                                             &dest->addr.in6);
                                return NULL;
                        }
                        __ip_vs_dst_set(dest, 0, dst_clone(&rt->u.dst));
-                       IP_VS_DBG(10, "new dst %p6, refcnt=%d\n",
+                       IP_VS_DBG(10, "new dst %pI6, refcnt=%d\n",
                                  &dest->addr.in6,
                                  atomic_read(&rt->u.dst.__refcnt));
                }
@@ -166,7 +166,7 @@ __ip_vs_get_out_rt_v6(struct ip_vs_conn *cp)
 
                rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
                if (!rt) {
-                       IP_VS_DBG_RL("ip6_route_output error, dest: %p6\n",
+                       IP_VS_DBG_RL("ip6_route_output error, dest: %pI6\n",
                                     &cp->daddr.in6);
                        return NULL;
                }
@@ -300,7 +300,7 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
 
        rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
        if (!rt) {
-               IP_VS_DBG_RL("ip_vs_bypass_xmit_v6(): ip6_route_output error, dest: %p6\n",
+               IP_VS_DBG_RL("ip_vs_bypass_xmit_v6(): ip6_route_output error, dest: %pI6\n",
                             &iph->daddr);
                goto tx_error_icmp;
        }

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 05bf82d345ceb29a1c2f78964abd2c6083485971..8cab6d5959097962099b7d3c194cc829828caf81 100644 (file)
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -467,7 +467,7 @@ static int help(struct sk_buff *skb,
                                 NIPQUAD(cmd.u3.ip),
                                 NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip));
                } else {
-                       pr_debug("conntrack_ftp: NOT RECORDING: %p6 != %p6\n",
+                       pr_debug("conntrack_ftp: NOT RECORDING: %pI6 != %pI6\n",
                                 cmd.u3.ip6,
                                 ct->tuplehash[dir].tuple.src.u3.ip6);
                }

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 29e49b1c80b35525f88e127d46a702a06bd82604..99bc803d1dd14ae9e30dc83f53e1f5ae147c2ce2 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -850,7 +850,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
            get_h225_addr(ct, *data, &setup->destCallSignalAddress,
                          &addr, &port) &&
            memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) {
-               pr_debug("nf_ct_q931: set destCallSignalAddress %p6:%hu->%p6:%hu\n",
+               pr_debug("nf_ct_q931: set destCallSignalAddress %pI6:%hu->%pI6:%hu\n",
                         &addr, ntohs(port), &ct->tuplehash[!dir].tuple.src.u3,
                         ntohs(ct->tuplehash[!dir].tuple.src.u.tcp.port));
                ret = set_h225_addr(skb, data, dataoff,
@@ -866,7 +866,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
            get_h225_addr(ct, *data, &setup->sourceCallSignalAddress,
                          &addr, &port) &&
            memcmp(&addr, &ct->tuplehash[!dir].tuple.dst.u3, sizeof(addr))) {
-               pr_debug("nf_ct_q931: set sourceCallSignalAddress %p6:%hu->%p6:%hu\n",
+               pr_debug("nf_ct_q931: set sourceCallSignalAddress %pI6:%hu->%pI6:%hu\n",
                         &addr, ntohs(port), &ct->tuplehash[!dir].tuple.dst.u3,
                         ntohs(ct->tuplehash[!dir].tuple.dst.u.tcp.port));
                ret = set_h225_addr(skb, data, dataoff,

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index f04c6ed43674d87996bc856899a93c1a2a9ef255..6379717f9044f94019f0a87289f04f4849ca64f4 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -904,7 +904,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
                                 ent->rateinfo.cost);
 #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
        case NFPROTO_IPV6:
-               return seq_printf(s, "%ld %p6:%u->%p6:%u %u %u %u\n",
+               return seq_printf(s, "%ld %pI6:%u->%pI6:%u %u %u %u\n",
                                 (long)(ent->expires - jiffies)/HZ,
                                 &ent->dst.ip6.src,
                                 ntohs(ent->dst.src_port),

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index a377ea333e1656b3be1d674bbb32ec540d19cc8b..b785727a5bf7b9b7df2f102267c19f53b5bf6e74 100644 (file)
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -426,7 +426,7 @@ static int recent_seq_show(struct seq_file *seq, void *v)
                           "oldest_pkt: %u", NIPQUAD(e->addr.ip), e->ttl,
                           e->stamps[i], e->index);
        else
-               seq_printf(seq, "src=%p6 ttl: %u last_seen: %lu oldest_pkt: %u",
+               seq_printf(seq, "src=%pI6 ttl: %u last_seen: %lu oldest_pkt: %u",
                           &e->addr.in6, e->ttl, e->stamps[i], e->index);
        for (i = 0; i < e->nstamps; i++)
                seq_printf(seq, "%s %lu", i ? "," : "", e->stamps[i]);

diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
index 614c95ec39dfb4a1e5ddf697e4a753dc32b5a10d..8b1c58b0820cde40d669caec4a152d3e8754fbfe 100644 (file)
--- a/net/netlabel/netlabel_addrlist.c
+++ b/net/netlabel/netlabel_addrlist.c
@@ -370,7 +370,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
 
        if (dev != NULL)
                audit_log_format(audit_buf, " netif=%s", dev);
-       audit_log_format(audit_buf, " %s=%p6", dir, addr);
+       audit_log_format(audit_buf, " %s=%pI6", dir, addr);
        if (ntohl(mask->s6_addr32[3]) != 0xffffffff) {
                u32 mask_len = 0;
                u32 mask_val;

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index e82668bd2b50f195b32467bbbc76d6e90fac66be..ceaa4aa066eaea3e00162d200f6d9bcb0c1d31f3 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -223,7 +223,7 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)
                ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
        }
 
-       SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%p6 dst:%p6\n",
+       SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n",
                          __func__, skb, skb->len,
                          &fl.fl6_src, &fl.fl6_dst);
 
@@ -251,18 +251,18 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
                fl.oif = daddr->v6.sin6_scope_id;
 
 
-       SCTP_DEBUG_PRINTK("%s: DST=%p6 ", __func__, &fl.fl6_dst);
+       SCTP_DEBUG_PRINTK("%s: DST=%pI6 ", __func__, &fl.fl6_dst);
 
        if (saddr) {
                ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr);
-               SCTP_DEBUG_PRINTK("SRC=%p6 - ", &fl.fl6_src);
+               SCTP_DEBUG_PRINTK("SRC=%pI6 - ", &fl.fl6_src);
        }
 
        dst = ip6_route_output(&init_net, NULL, &fl);
        if (!dst->error) {
                struct rt6_info *rt;
                rt = (struct rt6_info *)dst;
-               SCTP_DEBUG_PRINTK("rt6_dst:%p6 rt6_src:%p6\n",
+               SCTP_DEBUG_PRINTK("rt6_dst:%pI6 rt6_src:%pI6\n",
                        &rt->rt6i_dst.addr, &rt->rt6i_src.addr);
                return dst;
        }
@@ -309,7 +309,7 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
        __u8 matchlen = 0;
        __u8 bmatchlen;
 
-       SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%p6 ",
+       SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%pI6 ",
                          __func__, asoc, dst, &daddr->v6.sin6_addr);
 
        if (!asoc) {
@@ -318,7 +318,7 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
                                   &daddr->v6.sin6_addr,
                                   inet6_sk(&sk->inet.sk)->srcprefs,
                                   &saddr->v6.sin6_addr);
-               SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %p6\n",
+               SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n",
                                  &saddr->v6.sin6_addr);
                return;
        }
@@ -347,10 +347,10 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
 
        if (baddr) {
                memcpy(saddr, baddr, sizeof(union sctp_addr));
-               SCTP_DEBUG_PRINTK("saddr: %p6\n", &saddr->v6.sin6_addr);
+               SCTP_DEBUG_PRINTK("saddr: %pI6\n", &saddr->v6.sin6_addr);
        } else {
                printk(KERN_ERR "%s: asoc:%p Could not find a valid source "
-                      "address for the dest:%p6\n",
+                      "address for the dest:%pI6\n",
                       __func__, asoc, &daddr->v6.sin6_addr);
        }
 
@@ -720,7 +720,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, "%p6 ", &addr->v6.sin6_addr);
+       seq_printf(seq, "%pI6 ", &addr->v6.sin6_addr);
 }
 
 static void sctp_v6_ecn_capable(struct sock *sk)

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 9f370964e73311857b7ccc34fb36dc1977edbe2b..d07b484b873a862db244a901dafcb27fe5d0d554 100644 (file)
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1123,7 +1123,7 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
                if (from_addr.sa.sa_family == AF_INET6) {
                        if (net_ratelimit())
                                printk(KERN_WARNING
-                                   "%s association %p could not find address %p6\n",
+                                   "%s association %p could not find address %pI6\n",
                                    __func__,
                                    asoc,
                                    &from_addr.v6.sin6_addr);

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 26f61fd11eabbe90e28c935c3583594c5f62ea7d..8f067497c212d64b08ff8c758e254c9dfa6275c7 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -278,7 +278,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                case AF_INET6: {
                        struct sockaddr_in6 *sin =
                                        (struct sockaddr_in6 *)args->address;
-                       snprintf(servername, sizeof(servername), "%p6",
+                       snprintf(servername, sizeof(servername), "%pI6",
                                 &sin->sin6_addr);
                        break;
                }

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 968ec1f66bc37985d314b793d2672a1d82a04274..4c8adadc214df5ca5c0136eb17360826d8aff8d9 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -305,7 +305,7 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
                snprintf(buf, sizeof(buf), "::.%u.%u",
                                port >> 8, port & 0xff);
        else
-               snprintf(buf, sizeof(buf), "%p6.%u.%u",
+               snprintf(buf, sizeof(buf), "%pI6.%u.%u",
                         &address_to_register->sin6_addr,
                         port >> 8, port & 0xff);
        map->r_addr = buf;

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index eb640c1a1bc92f5dd5a48bffaaabc45add9f848b..16f714a247bc5e52609b023b618546a83c9dc89f 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd,
                                ntohl(im->m_addr.s6_addr32[3]) >>  8 & 0xff,
                                ntohl(im->m_addr.s6_addr32[3]) >>  0 & 0xff);
        } else {
-               snprintf(text_addr, 40, "%p6", &im->m_addr);
+               snprintf(text_addr, 40, "%pI6", &im->m_addr);
        }
        qword_add(bpp, blen, im->m_class);
        qword_add(bpp, blen, text_addr);
@@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m,
                        ntohl(addr.s6_addr32[3]) >>  0 & 0xff,
                        dom);
        } else {
-               seq_printf(m, "%s %p6 %s\n", im->m_class, &addr, dom);
+               seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
        }
        return 0;
 }

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 3c9aff584579fca2decf0f9b2a88f138c61c3c1a..f9ce3c9949d5da908b89c0b7b69b9717e4b71ece 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -341,7 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
        buf = kzalloc(40, GFP_KERNEL);
        if (buf) {
-               snprintf(buf, 40, "%p6",&addr->sin6_addr);
+               snprintf(buf, 40, "%pI6",&addr->sin6_addr);
        }
        xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
 
@@ -356,7 +356,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
        buf = kzalloc(64, GFP_KERNEL);
        if (buf) {
-               snprintf(buf, 64, "addr=%p6 port=%u proto=%s",
+               snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
                                &addr->sin6_addr,
                                ntohs(addr->sin6_port),
                                protocol);
@@ -378,7 +378,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
        buf = kzalloc(50, GFP_KERNEL);
        if (buf) {
-               snprintf(buf, 50, "%p6.%u.%u",
+               snprintf(buf, 50, "%pI6.%u.%u",
                         &addr->sin6_addr,
                         ntohs(addr->sin6_port) >> 8,
                         ntohs(addr->sin6_port) & 0xff);
@@ -1407,7 +1407,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
                if (port > last)
                        nloop++;
        } while (err == -EADDRINUSE && nloop != 2);
-       dprintk("RPC:       xs_bind6 %p6:%u: %s (%d)\n",
+       dprintk("RPC:       xs_bind6 %pI6:%u: %s (%d)\n",
                &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
        return err;
 }

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index f052b069f9837901f50a166fdaa3d8f7a54709bc..80b13eea30e72e265f08a937f3476c8141cb5559 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2467,11 +2467,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
                                         sel->prefixlen_d);
                break;
        case AF_INET6:
-               audit_log_format(audit_buf, " src=%p6", sel->saddr.a6);
+               audit_log_format(audit_buf, " src=%pI6", sel->saddr.a6);
                if (sel->prefixlen_s != 128)
                        audit_log_format(audit_buf, " src_prefixlen=%d",
                                         sel->prefixlen_s);
-               audit_log_format(audit_buf, " dst=%p6", sel->daddr.a6);
+               audit_log_format(audit_buf, " dst=%pI6", sel->daddr.a6);
                if (sel->prefixlen_d != 128)
                        audit_log_format(audit_buf, " dst_prefixlen=%d",
                                         sel->prefixlen_d);

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 7944861fb9bfeac9e35857968729b816e60b586a..304eca4ac9709e8ad117680ab2e40a116c80eac2 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2115,7 +2115,7 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
                                 NIPQUAD(x->id.daddr.a4));
                break;
        case AF_INET6:
-               audit_log_format(audit_buf, " src=%p6 dst=%p6",
+               audit_log_format(audit_buf, " src=%pI6 dst=%pI6",
                                 x->props.saddr.a6, x->id.daddr.a6);
                break;
        }
@@ -2140,7 +2140,7 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
        case AF_INET6:
                iph6 = ipv6_hdr(skb);
                audit_log_format(audit_buf,
-                                " src=%p6 dst=%p6 flowlbl=0x%x%02x%02x",
+                                " src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
                                 &iph6->saddr,&iph6->daddr,
                                 iph6->flow_lbl[0] & 0x0f,
                                 iph6->flow_lbl[1],

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index c91008f438a2cd3229ba4f5011d80dc166ebcb61..ed6af12cdf4309c9771deb108559bf9e58de1215 100644 (file)
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -495,7 +495,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
                                       char *name1, char *name2)
 {
        if (!ipv6_addr_any(addr))
-               audit_log_format(ab, " %s=%p6", name1, addr);
+               audit_log_format(ab, " %s=%pI6", name1, addr);
        if (port)
                audit_log_format(ab, " %s=%d", name2, ntohs(port));
 }