Commit ccc7f496 authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

net: print net_device reg_state in netdev_* unless it's registered

This way we'll always know in what status the device is, unless it's
running normally (i.e. NETDEV_REGISTERED).

Also, emit a warning once in case of a bad reg_state.

CC: "David S. Miller" <>
CC: Jason Baron <>
CC: Eric Dumazet <>
CC: Vlad Yasevich <>
CC: stephen hemminger <>
CC: Jerry Chu <>
CC: Ben Hutchings <>
CC: Joe Perches <>
Signed-off-by: default avatarVeaceslav Falico <>
Signed-off-by: default avatarDavid S. Miller <>
parent c6f854d5
......@@ -3388,6 +3388,21 @@ static inline const char *netdev_name(const struct net_device *dev)
return dev->name;
static inline const char *netdev_reg_state(const struct net_device *dev)
switch (dev->reg_state) {
case NETREG_UNINITIALIZED: return " (uninitialized)";
case NETREG_REGISTERED: return "";
case NETREG_UNREGISTERING: return " (unregistering)";
case NETREG_UNREGISTERED: return " (unregistered)";
case NETREG_RELEASED: return " (released)";
case NETREG_DUMMY: return " (dummy)";
WARN_ONCE(1, "%s: unknown reg_state %d\n", dev->name, dev->reg_state);
return " (unknown)";
__printf(3, 4)
int netdev_printk(const char *level, const struct net_device *dev,
const char *format, ...);
......@@ -3444,7 +3459,8 @@ do { \
* file/line information and a backtrace.
#define netdev_WARN(dev, format, args...) \
WARN(1, "netdevice: %s\n" format, netdev_name(dev), ##args)
WARN(1, "netdevice: %s%s\n" format, netdev_name(dev), \
netdev_reg_state(dev), ##args)
/* netif printk helpers, similar to netdev_printk */
......@@ -614,13 +614,15 @@ int __dynamic_netdev_dbg(struct _ddebug *descriptor,
char buf[PREFIX_SIZE];
res = dev_printk_emit(7, dev->dev.parent,
"%s%s %s %s: %pV",
"%s%s %s %s%s: %pV",
dynamic_emit_prefix(descriptor, buf),
netdev_name(dev), &vaf);
netdev_name(dev), netdev_reg_state(dev),
} else if (dev) {
res = printk(KERN_DEBUG "%s: %pV", netdev_name(dev), &vaf);
res = printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev),
netdev_reg_state(dev), &vaf);
} else {
res = printk(KERN_DEBUG "(NULL net_device): %pV", &vaf);
......@@ -6950,12 +6950,14 @@ static int __netdev_printk(const char *level, const struct net_device *dev,
if (dev && dev->dev.parent) {
r = dev_printk_emit(level[1] - '0',
"%s %s %s: %pV",
"%s %s %s%s: %pV",
netdev_name(dev), vaf);
netdev_name(dev), netdev_reg_state(dev),
} else if (dev) {
r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
r = printk("%s%s%s: %pV", level, netdev_name(dev),
netdev_reg_state(dev), vaf);
} else {
r = printk("%s(NULL net_device): %pV", level, vaf);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment