summaryrefslogtreecommitdiff
path: root/include/linux/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 17:33:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 17:33:56 -0700
commit4c015ba24bbe8558cce5925546abd590e4146a23 (patch)
tree8bff5827d8667c7d2d87b0daec763e41a8a7b0b0 /include/linux/usb
parentd1ddb0a6bb665dce10314bb5b9960e197e814820 (diff)
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
Merge 3.12-rc4 into usb-next
We want the USB fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/usbnet.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 9cb2fe8ca944..e303eef94dd5 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -42,6 +42,7 @@ struct usbnet {
struct usb_host_endpoint *status;
unsigned maxpacket;
struct timer_list delay;
+ const char *padding_pkt;
/* protocol/interface state */
struct net_device *net;