diff -Naur linux.org/include/linux/netdevice.h linux.netdev_printk.patched/include/linux/netdevice.h --- linux.org/include/linux/netdevice.h Thu May 1 08:46:13 2003 +++ linux.netdev_printk.patched/include/linux/netdevice.h Thu May 1 08:46:13 2003 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -269,6 +269,7 @@ unsigned long state; struct net_device *next; + struct device *dev; /* underlying device */ /* The device initialization function. Called only once. */ int (*init)(struct net_device *dev); @@ -835,6 +836,32 @@ extern void dev_clear_fastroute(struct net_device *dev); #endif +/* debugging and troubleshooting/diagnostic helpers. */ +/** + * netdev_printk() - Log message with interface name, driver name, bus ID. + * @level: severity level -- e.g., KERN_INFO + * @netdev: net_device pointer + * @format: as with printk + * @args: as with printk + */ +#define netdev_printk(level, netdev, format, arg...) \ + printk(level "%s %s %s: " format , (netdev)->name , \ + ((netdev)->dev ? (netdev)->dev->driver->name : "") , \ + ((netdev)->dev ? (netdev)->dev->bus_id : "") , ## arg) + +#ifdef DEBUG +#define netdev_dbg(netdev, format, arg...) \ + netdev_printk(KERN_DEBUG , netdev , format , ## arg) +#else +#define netdev_dbg(netdev, format, arg...) do {} while (0) +#endif + +#define netdev_err(netdev, format, arg...) \ + netdev_printk(KERN_ERR , netdev , format , ## arg) +#define netdev_info(netdev, format, arg...) \ + netdev_printk(KERN_INFO , netdev , format , ## arg) +#define netdev_warn(netdev, format, arg...) \ + netdev_printk(KERN_WARNING , netdev , format , ## arg) #endif /* __KERNEL__ */