diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-06 12:57:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-06 12:57:18 -0700 |
| commit | bfe34ebbaa125f00da309f59cc9d30febe1e3115 (patch) | |
| tree | 505b43fc81be09ec5b42f82a3e64f300a5e838d5 /include/linux/usb/usbnet.h | |
| parent | 3d7ddd540b4c2d24c6a3e7a52c083a0c31e6151c (diff) | |
| parent | 6b4f645a491ac29c7dced415d034eea7736155a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 7c17b2efba8..de8b4b18961 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -86,6 +86,7 @@ struct driver_info { #define FLAG_FRAMING_AX 0x0040 /* AX88772/178 packets */ #define FLAG_WLAN 0x0080 /* use "wlan%d" names */ +#define FLAG_AVOID_UNLINK_URBS 0x0100 /* don't unlink urbs at usbnet_stop() */ /* init device ... can sleep, or cause probe() failure */ @@ -121,9 +122,8 @@ struct driver_info { * right after minidriver have initialized hardware. */ int (*early_init)(struct usbnet *dev); - /* called by minidriver when link state changes, state: 0=disconnect, - * 1=connect */ - void (*link_change)(struct usbnet *dev, int state); + /* called by minidriver when receiving indication */ + void (*indication)(struct usbnet *dev, void *ind, int indlen); /* for new devices, use the descriptor-reading code instead */ int in; /* rx endpoint */ |