summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-01-09 04:53:15 +0300
committerDavid S. Miller <davem@davemloft.net>2018-01-09 04:53:15 +0300
commitf1f2b7c325debbc0a58f6e44ece3e5d94ded843d (patch)
treeccf68fa47d2664c278977d19b8847cf04ceed0b7 /include/linux
parent9f0e896f35020d1e0e513b365a62fb5e06066764 (diff)
parent9d0b967f0e3d4a79a142770b0032953f65e91df8 (diff)
downloadlinux-f1f2b7c325debbc0a58f6e44ece3e5d94ded843d.tar.xz
Merge branch 'net-netdev_WARN_ONCE'
Gal Pressman says: ==================== Replace WARN_ONCE usages with netdev_WARN_ONCE This series will fix an issue in netdev_WARN_ONCE, improve its formatting and replace drivers' usage of WARN_ONCE to netdev_WARN_ONCE. Driver specific patches were compilation tested, in addition, functional tested on Mellanox NIC. v1->v2: - Addressed commit message comments in patch #1 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netdevice.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 440b000f07f4..6f54c58b623b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4406,11 +4406,11 @@ do { \
* file/line information and a backtrace.
*/
#define netdev_WARN(dev, format, args...) \
- WARN(1, "netdevice: %s%s\n" format, netdev_name(dev), \
+ WARN(1, "netdevice: %s%s: " format, netdev_name(dev), \
netdev_reg_state(dev), ##args)
-#define netdev_WARN_ONCE(dev, condition, format, arg...) \
- WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev) \
+#define netdev_WARN_ONCE(dev, format, args...) \
+ WARN_ONCE(1, "netdevice: %s%s: " format, netdev_name(dev), \
netdev_reg_state(dev), ##args)
/* netif printk helpers, similar to netdev_printk */