2 files changed, 24 insertions, 26 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index fd9028d7c06e..56c823c175fe 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2585,8 +2585,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                 if (rv) {
                         if (net_ratelimit()) {
                                 printk(KERN_WARNING DRV_NAME
-                             ": %s: no route to arp_ip_target %u.%u.%u.%u\n",
-                                       bond->dev->name, NIPQUAD(fl.fl4_dst));
+                             ": %s: no route to arp_ip_target %pI4\n",
+                                       bond->dev->name, &fl.fl4_dst);
                         }
                         continue;
                 }
@@ -2622,8 +2622,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 
                 if (net_ratelimit()) {
                         printk(KERN_WARNING DRV_NAME
-               ": %s: no path to arp_ip_target %u.%u.%u.%u via rt.dev %s\n",
-                               bond->dev->name, NIPQUAD(fl.fl4_dst),
+               ": %s: no path to arp_ip_target %pI4 via rt.dev %s\n",
+                               bond->dev->name, &fl.fl4_dst,
                                rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
@@ -2672,10 +2672,8 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
 
         targets = bond->params.arp_targets;
         for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) {
-                dprintk("bva: sip %u.%u.%u.%u tip %u.%u.%u.%u t[%d] "
-                        "%u.%u.%u.%u bhti(tip) %d\n",
-                       NIPQUAD(sip), NIPQUAD(tip), i, NIPQUAD(targets[i]),
-                       bond_has_this_ip(bond, tip));
+                dprintk("bva: sip %pI4 tip %pI4 t[%d] %pI4 bhti(tip) %d\n",
+                        &sip, &tip, i, &targets[i], bond_has_this_ip(bond, tip));
                 if (sip == targets[i]) {
                         if (bond_has_this_ip(bond, tip))
                                 slave->last_arp_rx = jiffies;
@@ -2727,10 +2725,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         arp_ptr += 4 + dev->addr_len;
         memcpy(&tip, arp_ptr, 4);
 
-        dprintk("bond_arp_rcv: %s %s/%d av %d sv %d sip %u.%u.%u.%u"
-                " tip %u.%u.%u.%u\n", bond->dev->name, slave->dev->name,
-                slave->state, bond->params.arp_validate,
-                slave_do_arp_validate(bond, slave), NIPQUAD(sip), NIPQUAD(tip));
+        dprintk("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
+                bond->dev->name, slave->dev->name, slave->state,
+                bond->params.arp_validate, slave_do_arp_validate(bond, slave),
+                &sip, &tip);
 
         /*
          * Backup slaves won't see the ARP reply, but do come through
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 99c79a4e0806..296a865b75d2 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -672,8 +672,8 @@ static ssize_t bonding_show_arp_targets(struct device *d,
 
         for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
                 if (bond->params.arp_targets[i])
-                        res += sprintf(buf + res, "%u.%u.%u.%u ",
-                               NIPQUAD(bond->params.arp_targets[i]));
+                        res += sprintf(buf + res, "%pI4 ",
+                                       &bond->params.arp_targets[i]);
         }
         if (res)
                 buf[res-1] = '\n'; /* eat the leftover space */
@@ -695,8 +695,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         if (buf[0] == '+') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
                         printk(KERN_ERR DRV_NAME
-                               ": %s: invalid ARP target %u.%u.%u.%u specified for addition\n",
-                               bond->dev->name, NIPQUAD(newtarget));
+                               ": %s: invalid ARP target %pI4 specified for addition\n",
+                               bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
@@ -704,8 +704,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
                         if (targets[i] == newtarget) { /* duplicate */
                                 printk(KERN_ERR DRV_NAME
-                                       ": %s: ARP target %u.%u.%u.%u is already present\n",
-                                       bond->dev->name, NIPQUAD(newtarget));
+                                       ": %s: ARP target %pI4 is already present\n",
+                                       bond->dev->name, &newtarget);
                                 if (done)
                                         targets[i] = 0;
                                 ret = -EINVAL;
@@ -713,8 +713,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                         if (targets[i] == 0 && !done) {
                                 printk(KERN_INFO DRV_NAME
-                                       ": %s: adding ARP target %d.%d.%d.%d.\n",
-                                       bond->dev->name, NIPQUAD(newtarget));
+                                       ": %s: adding ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                 done = 1;
                                 targets[i] = newtarget;
                         }
@@ -731,8 +731,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         else if (buf[0] == '-') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
                         printk(KERN_ERR DRV_NAME
-                               ": %s: invalid ARP target %d.%d.%d.%d specified for removal\n",
-                               bond->dev->name, NIPQUAD(newtarget));
+                               ": %s: invalid ARP target %pI4 specified for removal\n",
+                               bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
@@ -740,16 +740,16 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
                         if (targets[i] == newtarget) {
                                 printk(KERN_INFO DRV_NAME
-                                       ": %s: removing ARP target %d.%d.%d.%d.\n",
-                                       bond->dev->name, NIPQUAD(newtarget));
+                                       ": %s: removing ARP target %pI4.\n",
+                                       bond->dev->name, &newtarget);
                                 targets[i] = 0;
                                 done = 1;
                         }
                 }
                 if (!done) {
                         printk(KERN_INFO DRV_NAME
-                               ": %s: unable to remove nonexistent ARP target %d.%d.%d.%d.\n",
-                               bond->dev->name, NIPQUAD(newtarget));
+                               ": %s: unable to remove nonexistent ARP target %pI4.\n",
+                               bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }