Skip to content

Commit

Permalink
bonding: convert bond_netlink.c to use netdev_printk instead of pr_
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
vfalico authored and davem330 committed Jul 16, 2014
1 parent 9ef1cf1 commit a5f2454
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/net/bonding/bond_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -207,17 +206,15 @@ 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;
}
if (data[IFLA_BOND_ARP_VALIDATE]) {
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;
}

Expand Down

0 comments on commit a5f2454

Please sign in to comment.