From linux-usb-devel-bounces@lists.sourceforge.net Sun Oct 8 05:02:24 2006 Date: Sun, 8 Oct 2006 16:02:00 +0400 From: Alexey Dobriyan To: Andrew Morton Message-ID: <20061008120200.GE5344@martell.zuzino.mipt.ru> Content-Disposition: inline Cc: linux-usb-devel@lists.sourceforge.net Subject: USB: drivers/usb/net/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Signed-off-by: Greg Kroah-Hartman --- drivers/usb/net/cdc_ether.c | 2 +- drivers/usb/net/usbnet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/usb/net/cdc_ether.c +++ gregkh-2.6/drivers/usb/net/cdc_ether.c @@ -498,7 +498,7 @@ static struct usb_driver cdc_driver = { static int __init cdc_init(void) { - BUG_ON((sizeof(((struct usbnet *)0)->data) + BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) < sizeof(struct cdc_state))); return usb_register(&cdc_driver); --- gregkh-2.6.orig/drivers/usb/net/usbnet.c +++ gregkh-2.6/drivers/usb/net/usbnet.c @@ -1225,7 +1225,7 @@ EXPORT_SYMBOL_GPL(usbnet_resume); static int __init usbnet_init(void) { /* compiler should optimize this out */ - BUG_ON (sizeof (((struct sk_buff *)0)->cb) + BUILD_BUG_ON (sizeof (((struct sk_buff *)0)->cb) < sizeof (struct skb_data)); random_ether_addr(node_id);