diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-03-30 21:37:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-30 21:37:29 -0700 |
| commit | 4e700bcdd89a5592a5a991bf3e78904de1140611 (patch) | |
| tree | 1a21ea2eb4c0ebe1a9d5303c6cc8328474f7f5e1 /include/linux/usb/usbnet.h | |
| parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | sctp: Pass __GFP_NOWARN to hash table allocation attempts. (diff) | |
| download | linux-dev-4e700bcdd89a5592a5a991bf3e78904de1140611.tar.xz linux-dev-4e700bcdd89a5592a5a991bf3e78904de1140611.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 44842c8d38c0..201f2228f731 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -102,6 +102,7 @@ struct driver_info { * Affects statistic (counters) and short packet handling. */ #define FLAG_MULTI_PACKET 0x1000 +#define FLAG_RX_ASSEMBLE 0x2000 /* rx packets may span >1 frames */ /* init device ... can sleep, or cause probe() failure */ int (*bind)(struct usbnet *, struct usb_interface *); @@ -172,7 +173,9 @@ struct cdc_state { }; extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *); +extern int usbnet_cdc_bind(struct usbnet *, struct usb_interface *); extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *); +extern void usbnet_cdc_status(struct usbnet *, struct urb *); /* CDC and RNDIS support the same host-chosen packet filters for IN transfers */ #define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \ |