diff options
author | Veaceslav Falico <vfalico@gmail.com> | 2014-07-17 13:46:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-20 23:38:43 -0400 |
commit | ccc7f4968a18b980994e622006b84e0195754390 (patch) | |
tree | 92c83d2cbb4ff1a24b21295853f3c5008d1d0158 /net/core | |
parent | c6f854d57d704a97adbf952ef0948acc68f3312c (diff) |
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" <davem@davemloft.net>
CC: Jason Baron <jbaron@akamai.com>
CC: Eric Dumazet <edumazet@google.com>
CC: Vlad Yasevich <vyasevic@redhat.com>
CC: stephen hemminger <stephen@networkplumber.org>
CC: Jerry Chu <hkchu@google.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
CC: Joe Perches <joe@perches.com>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 239722af098d..81d61014fd9b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -6950,12 +6950,14 @@ static int __netdev_printk(const char *level, const struct net_device *dev, | |||
6950 | if (dev && dev->dev.parent) { | 6950 | if (dev && dev->dev.parent) { |
6951 | r = dev_printk_emit(level[1] - '0', | 6951 | r = dev_printk_emit(level[1] - '0', |
6952 | dev->dev.parent, | 6952 | dev->dev.parent, |
6953 | "%s %s %s: %pV", | 6953 | "%s %s %s%s: %pV", |
6954 | dev_driver_string(dev->dev.parent), | 6954 | dev_driver_string(dev->dev.parent), |
6955 | dev_name(dev->dev.parent), | 6955 | dev_name(dev->dev.parent), |
6956 | netdev_name(dev), vaf); | 6956 | netdev_name(dev), netdev_reg_state(dev), |
6957 | vaf); | ||
6957 | } else if (dev) { | 6958 | } else if (dev) { |
6958 | r = printk("%s%s: %pV", level, netdev_name(dev), vaf); | 6959 | r = printk("%s%s%s: %pV", level, netdev_name(dev), |
6960 | netdev_reg_state(dev), vaf); | ||
6959 | } else { | 6961 | } else { |
6960 | r = printk("%s(NULL net_device): %pV", level, vaf); | 6962 | r = printk("%s(NULL net_device): %pV", level, vaf); |
6961 | } | 6963 | } |