]>
Commit | Line | Data |
---|---|---|
9a34a05c AF |
1 | diff -Naur compat-wireless-2.6.34.org/include/linux/usb/usbnet.h compat-wireless-2.6.34/include/linux/usb/usbnet.h |
2 | --- compat-wireless-2.6.34.org/include/linux/usb/usbnet.h 2010-05-18 03:12:10.000000000 +0200 | |
3 | +++ compat-wireless-2.6.34/include/linux/usb/usbnet.h 2010-05-22 22:18:34.000000000 +0200 | |
4 | @@ -214,4 +214,24 @@ | |
5 | extern void usbnet_get_drvinfo (struct net_device *, struct ethtool_drvinfo *); | |
6 | extern int usbnet_nway_reset(struct net_device *net); | |
7 | ||
8 | +/* messaging support includes the interface name, so it must not be | |
9 | + * used before it has one ... notably, in minidriver bind() calls. | |
10 | + */ | |
11 | +#ifdef DEBUG | |
12 | +#define devdbg(usbnet, fmt, arg...) \ | |
13 | + printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg) | |
14 | +#else | |
15 | +#define devdbg(usbnet, fmt, arg...) \ | |
16 | + ({ if (0) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , \ | |
17 | + ## arg); 0; }) | |
18 | +#endif | |
19 | + | |
20 | +#define deverr(usbnet, fmt, arg...) \ | |
21 | + printk(KERN_ERR "%s: " fmt "\n" , (usbnet)->net->name , ## arg) | |
22 | +#define devwarn(usbnet, fmt, arg...) \ | |
23 | + printk(KERN_WARNING "%s: " fmt "\n" , (usbnet)->net->name , ## arg) | |
24 | + | |
25 | +#define devinfo(usbnet, fmt, arg...) \ | |
26 | + printk(KERN_INFO "%s: " fmt "\n" , (usbnet)->net->name , ## arg); \ | |
27 | + | |
28 | #endif /* __LINUX_USB_USBNET_H */ |