Where possible, we generally want both the bond master and the relevant slave
information in message output. Standardize the format using new slave_*
printk macros.

Suggested-by: Joe Perches <[email protected]>
CC: Jay Vosburgh <[email protected]>
CC: Veaceslav Falico <[email protected]>
CC: Andy Gospodarek <[email protected]>
CC: [email protected]
Signed-off-by: Jarod Wilson <[email protected]>
---
 include/net/bonding.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/net/bonding.h b/include/net/bonding.h
index b46d68acf701..676e7fae05a3 100644
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -38,6 +38,15 @@
 #define __long_aligned __attribute__((aligned((sizeof(long)))))
 #endif
 
+#define slave_info(bond_dev, slave_dev, fmt, ...) \
+       netdev_info(bond_dev, "(slave %s): " fmt, (slave_dev)->name, 
##__VA_ARGS__)
+#define slave_warn(bond_dev, slave_dev, fmt, ...) \
+       netdev_warn(bond_dev, "(slave %s): " fmt, (slave_dev)->name, 
##__VA_ARGS__)
+#define slave_dbg(bond_dev, slave_dev, fmt, ...) \
+       netdev_dbg(bond_dev, "(slave %s): " fmt, (slave_dev)->name, 
##__VA_ARGS__)
+#define slave_err(bond_dev, slave_dev, fmt, ...) \
+       netdev_err(bond_dev, "(slave %s): " fmt, (slave_dev)->name, 
##__VA_ARGS__)
+
 #define BOND_MODE(bond) ((bond)->params.mode)
 
 /* slave list primitives */
-- 
2.20.1

Reply via email to