Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b095d98 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: replace %p6 with %pI6 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b7a4274

drivers/firmware/iscsi_ibft.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip) 
		/*

		/*

		 * IPv6

		 * IPv6

		 */

		 */

		str += sprintf(str, "%p6", ip);

		str += sprintf(str, "%pI6", ip);

	}

	}

	str += sprintf(str, "\n");

	str += sprintf(str, "\n");

	return str - buf;

	return str - buf;

drivers/infiniband/core/sysfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,7 @@ static ssize_t show_port_gid(struct ib_port *p, struct port_attribute *attr, 
	if (ret)

	if (ret)

		return 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,

static ssize_t show_port_pkey(struct ib_port *p, struct port_attribute *attr,

drivers/infiniband/hw/mthca/mthca_mcg.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ static int find_mgm(struct mthca_dev *dev, 
	}

	}





	if (0)

	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;

	*index = *hash;

	*prev  = -1;

	*prev  = -1;
@@ -254,7 +254,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
		goto out;

		goto out;





	if (index == -1) {

	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;

		err = -EINVAL;

		goto out;

		goto out;

	}

	}

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn, 
		goto err_send_cm;

		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);

		  p->qp->qp_num, pathrec->dgid.raw, qpn);





	return 0;

	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)) {

	if (test_and_clear_bit(IPOIB_FLAG_INITIALIZED, &tx->flags)) {

		list_move(&tx->list, &priv->cm.reap_list);

		list_move(&tx->list, &priv->cm.reap_list);

		queue_work(ipoib_workqueue, &priv->cm.reap_task);

		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->dgid.raw);

		tx->neigh = NULL;

		tx->neigh = NULL;

	}

	}

drivers/infiniband/ulp/ipoib/ipoib_main.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ void ipoib_mark_paths_invalid(struct net_device *dev) 
	spin_lock_irq(&priv->lock);

	spin_lock_irq(&priv->lock);





	list_for_each_entry_safe(path, tp, &priv->path_list, list) {

	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),

			be16_to_cpu(path->pathrec.dlid),

			path->pathrec.dgid.raw);

			path->pathrec.dgid.raw);

		path->valid =  0;

		path->valid =  0;
@@ -413,10 +413,10 @@ static void path_rec_completion(int status, 
	unsigned long flags;

	unsigned long flags;





	if (!status)

	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);

			  be16_to_cpu(pathrec->dlid), pathrec->dgid.raw);

	else

	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);

			  status, path->pathrec.dgid.raw);





	skb_queue_head_init(&skqueue);

	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);

	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);

		  path->pathrec.dgid.raw);





	init_completion(&path->done);

	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) &&

			if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&

			    (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {

			    (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",

					   skb->dst ? "neigh" : "dst",

					   be16_to_cpup((__be16 *) skb->data),

					   be16_to_cpup((__be16 *) skb->data),

					   IPOIB_QPN(phdr->hwaddr),

					   IPOIB_QPN(phdr->hwaddr),
@@ -844,7 +844,7 @@ static void ipoib_neigh_cleanup(struct neighbour *n) 
	else

	else

		return;

		return;

	ipoib_dbg(priv,

	ipoib_dbg(priv,

		  "neigh_cleanup for %06x %p6\n",

		  "neigh_cleanup for %06x %pI6\n",

		  IPOIB_QPN(n->ha),

		  IPOIB_QPN(n->ha),

		  n->ha + 4);

		  n->ha + 4);