aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorVeaceslav Falico <vfalico@gmail.com>2014-07-15 13:36:05 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-16 02:15:58 -0400
commita5f24542ab61f4dc3d07fb4ae7d8903c3040449a (patch)
tree31b8e04a79bde323815aea0c60897f286ac4f679 /drivers/net/bonding
parent9ef1cf16cfc789eb631eb38d46d5dbfb36832546 (diff)
bonding: convert bond_netlink.c to use netdev_printk instead of pr_
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>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_netlink.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 4d97e23eb497..6b58f8af88cc 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -181,8 +181,7 @@ static int bond_changelink(struct net_device *bond_dev,
181 int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]); 181 int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]);
182 182
183 if (arp_interval && miimon) { 183 if (arp_interval && miimon) {
184 pr_err("%s: ARP monitoring cannot be used with MII monitoring\n", 184 netdev_err(bond->dev, "ARP monitoring cannot be used with MII monitoring\n");
185 bond->dev->name);
186 return -EINVAL; 185 return -EINVAL;
187 } 186 }
188 187
@@ -207,8 +206,7 @@ static int bond_changelink(struct net_device *bond_dev,
207 i++; 206 i++;
208 } 207 }
209 if (i == 0 && bond->params.arp_interval) 208 if (i == 0 && bond->params.arp_interval)
210 pr_warn("%s: Removing last arp target with arp_interval on\n", 209 netdev_warn(bond->dev, "Removing last arp target with arp_interval on\n");
211 bond->dev->name);
212 if (err) 210 if (err)
213 return err; 211 return err;
214 } 212 }
@@ -216,8 +214,7 @@ static int bond_changelink(struct net_device *bond_dev,
216 int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]); 214 int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);
217 215
218 if (arp_validate && miimon) { 216 if (arp_validate && miimon) {
219 pr_err("%s: ARP validating cannot be used with MII monitoring\n", 217 netdev_err(bond->dev, "ARP validating cannot be used with MII monitoring\n");
220 bond->dev->name);
221 return -EINVAL; 218 return -EINVAL;
222 } 219 }
223 220