diff options
| author | Raj Jayaraman <rjayaraman@nvidia.com> | 2012-01-20 11:07:23 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-01-30 11:48:08 -0800 |
| commit | da0280659ba3f62d6dcb7b3b2b2f20a9c54c2d0b (patch) | |
| tree | 251662d52849fb1a9c3d14d36f3690d047e40b27 /include | |
| parent | fd258f5af846be6a3d92b3612b73cd2ab07d0043 (diff) | |
usbnet: Fix 'FLAG_RMNET' and 'FLAG_MULTI_PACKET' overlap.
Bug 901367
Change-Id: I73fe7c19f5f50530f7d0a73d0a6b9ba2092c71d2
Reviewed-on: http://git-master/r/76664
Reviewed-by: Steve Lin <stlin@nvidia.com>
Signed-off-by: Raj Jayaraman <rjayaraman@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Change-Id: I309eb6178a7f39714f9e5f963faf011a1a79b079
Reviewed-on: http://git-master/r/77309
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/usbnet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index a4d4163953d8..6939637e787d 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -99,7 +99,6 @@ struct driver_info { #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ -#define FLAG_RMNET 0x2000 /* use "rmnet%d" names */ /* * Indicates to usbnet, that USB driver accumulates multiple IP packets. @@ -107,6 +106,7 @@ struct driver_info { */ #define FLAG_MULTI_PACKET 0x2000 #define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */ +#define FLAG_RMNET 0x8000 /* use "rmnet%d" names */ /* init device ... can sleep, or cause probe() failure */ int (*bind)(struct usbnet *, struct usb_interface *); |