usbnet: Fix 'FLAG_RMNET' and 'FLAG_MULTI_PACKET' overlap.
Raj Jayaraman [Fri, 20 Jan 2012 19:07:23 +0000 (11:07 -0800)]
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

include/linux/usb/usbnet.h

index a4d4163..6939637 100644 (file)
@@ -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 *);