diff options
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0db1f5f6d4a8..c8615cd0b2f6 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2619,6 +2619,9 @@ static inline const char *netdev_name(const struct net_device *dev) | |||
2619 | return dev->name; | 2619 | return dev->name; |
2620 | } | 2620 | } |
2621 | 2621 | ||
2622 | extern int __netdev_printk(const char *level, const struct net_device *dev, | ||
2623 | struct va_format *vaf); | ||
2624 | |||
2622 | extern int netdev_printk(const char *level, const struct net_device *dev, | 2625 | extern int netdev_printk(const char *level, const struct net_device *dev, |
2623 | const char *format, ...) | 2626 | const char *format, ...) |
2624 | __attribute__ ((format (printf, 3, 4))); | 2627 | __attribute__ ((format (printf, 3, 4))); |
@@ -2646,8 +2649,7 @@ extern int netdev_info(const struct net_device *dev, const char *format, ...) | |||
2646 | #elif defined(CONFIG_DYNAMIC_DEBUG) | 2649 | #elif defined(CONFIG_DYNAMIC_DEBUG) |
2647 | #define netdev_dbg(__dev, format, args...) \ | 2650 | #define netdev_dbg(__dev, format, args...) \ |
2648 | do { \ | 2651 | do { \ |
2649 | dynamic_dev_dbg((__dev)->dev.parent, "%s: " format, \ | 2652 | dynamic_netdev_dbg(__dev, format, ##args); \ |
2650 | netdev_name(__dev), ##args); \ | ||
2651 | } while (0) | 2653 | } while (0) |
2652 | #else | 2654 | #else |
2653 | #define netdev_dbg(__dev, format, args...) \ | 2655 | #define netdev_dbg(__dev, format, args...) \ |
@@ -2714,9 +2716,7 @@ do { \ | |||
2714 | #define netif_dbg(priv, type, netdev, format, args...) \ | 2716 | #define netif_dbg(priv, type, netdev, format, args...) \ |
2715 | do { \ | 2717 | do { \ |
2716 | if (netif_msg_##type(priv)) \ | 2718 | if (netif_msg_##type(priv)) \ |
2717 | dynamic_dev_dbg((netdev)->dev.parent, \ | 2719 | dynamic_netdev_dbg(netdev, format, ##args); \ |
2718 | "%s: " format, \ | ||
2719 | netdev_name(netdev), ##args); \ | ||
2720 | } while (0) | 2720 | } while (0) |
2721 | #else | 2721 | #else |
2722 | #define netif_dbg(priv, type, dev, format, args...) \ | 2722 | #define netif_dbg(priv, type, dev, format, args...) \ |