diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-15 23:16:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-15 23:16:15 -0700 |
| commit | 7a575f6b907ea5d207d2b5010293c189616eae34 (patch) | |
| tree | 1945288ff37e2690be41a4e3c35e1e7e196f75b0 /drivers/net/bonding/bond_procfs.c | |
| parent | a84bc2a9013fb123deeca7283480955d021503fb (diff) | |
| parent | cb25235860c8b6552a8f9cca3291e9d46efb7925 (diff) | |
| download | linux-stable-7a575f6b907ea5d207d2b5010293c189616eae34.tar.gz linux-stable-7a575f6b907ea5d207d2b5010293c189616eae34.tar.bz2 linux-stable-7a575f6b907ea5d207d2b5010293c189616eae34.zip | |
Merge branch 'bonding-next'
Veaceslav Falico says:
====================
bonding: convert pr_* to netdev_*
Currently bonding uses pr_info/warn/etc. function to print something, while
it's encouraged to use netdev_info/warn/etc. in net/.
This patchset converts them where possible (i.e. where we have a working
net_device). Also, convert pr_ratelimit* to net_() and remove the pr_fmt,
to unify netdev_* and pr_* outputs.
====================
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/bond_procfs.c')
| -rw-r--r-- | drivers/net/bonding/bond_procfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c index b215b479bb3a..de62c0385dfb 100644 --- a/drivers/net/bonding/bond_procfs.c +++ b/drivers/net/bonding/bond_procfs.c @@ -252,8 +252,8 @@ void bond_create_proc_entry(struct bonding *bond) S_IRUGO, bn->proc_dir, &bond_info_fops, bond); if (bond->proc_entry == NULL) - pr_warn("Warning: Cannot create /proc/net/%s/%s\n", - DRV_NAME, bond_dev->name); + netdev_warn(bond_dev, "Cannot create /proc/net/%s/%s\n", + DRV_NAME, bond_dev->name); else memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ); } |