diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-09 23:36:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-09 23:36:01 +0300 |
| commit | 90b8b7e755db648de7f1d17e3729dd7154a046a0 (patch) | |
| tree | be4f89e347f1e16cd088eadbb2d681594b7f176c /include/net | |
| parent | 517a772c6c654eff3739c2e7ca3ecf3f895550ab (diff) | |
| parent | f887e54ce34906c266b30b8fca0907d3151ac925 (diff) | |
| download | linux-90b8b7e755db648de7f1d17e3729dd7154a046a0.tar.xz | |
Merge branch 'bonding-clean-up-and-standarize-logging-printks'
Jarod Wilson says:
====================
bonding: clean up and standarize logging printks
This set improves a few somewhat terse bonding debug messages, fixes some
errors in others, and then standarizes the majority of them, using new
slave_* printk macros that wrap around netdev_* to ensure both master
and slave information is provided consistently, where relevant. This set
proves very useful in debugging issues on hosts with multiple bonds.
I've run an array of LNST tests over this set, creating and destroying
quite a few different bonds of the course of testing, fixed the little
gotchas here and there, and everything looks stable and reasonable to me,
but I can't guarantee I've tested every possible message and scenario to
catch every possible "slave could be NULL" case.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bonding.h | 9 |
1 files changed, 9 insertions, 0 deletions
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 */ |