OSDN Git Service

bonding: convert bond_netlink.c to use netdev_printk instead of pr_
authorVeaceslav Falico <vfalico@gmail.com>
Tue, 15 Jul 2014 17:36:05 +0000 (19:36 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 06:15:58 +0000 (23:15 -0700)
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_netlink.c

index 4d97e23..6b58f8a 100644 (file)
@@ -181,8 +181,7 @@ static int bond_changelink(struct net_device *bond_dev,
                int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]);
 
                if (arp_interval && miimon) {
-                       pr_err("%s: ARP monitoring cannot be used with MII monitoring\n",
-                              bond->dev->name);
+                       netdev_err(bond->dev, "ARP monitoring cannot be used with MII monitoring\n");
                        return -EINVAL;
                }
 
@@ -207,8 +206,7 @@ static int bond_changelink(struct net_device *bond_dev,
                        i++;
                }
                if (i == 0 && bond->params.arp_interval)
-                       pr_warn("%s: Removing last arp target with arp_interval on\n",
-                               bond->dev->name);
+                       netdev_warn(bond->dev, "Removing last arp target with arp_interval on\n");
                if (err)
                        return err;
        }
@@ -216,8 +214,7 @@ static int bond_changelink(struct net_device *bond_dev,
                int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);
 
                if (arp_validate && miimon) {
-                       pr_err("%s: ARP validating cannot be used with MII monitoring\n",
-                              bond->dev->name);
+                       netdev_err(bond->dev, "ARP validating cannot be used with MII monitoring\n");
                        return -EINVAL;
                }