Commit 9c79330d authored by Lucas Stach's avatar Lucas Stach Committed by David S. Miller

net: usb: fix regression from FLAG_NOARP code

In commit 6509141f ("usbnet: add new
flag FLAG_NOARP for usb net devices"), the newly added flag NOARP was
using an already defined value, which broke drivers using flag
MULTI_PACKET.
Signed-off-by: default avatarLucas Stach <dev@lynxeye.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87c084a9
...@@ -102,7 +102,6 @@ struct driver_info { ...@@ -102,7 +102,6 @@ struct driver_info {
#define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */
#define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */
#define FLAG_NOARP 0x2000 /* device can't do ARP */
/* /*
* Indicates to usbnet, that USB driver accumulates multiple IP packets. * Indicates to usbnet, that USB driver accumulates multiple IP packets.
...@@ -110,6 +109,7 @@ struct driver_info { ...@@ -110,6 +109,7 @@ struct driver_info {
*/ */
#define FLAG_MULTI_PACKET 0x2000 #define FLAG_MULTI_PACKET 0x2000
#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */ #define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */
#define FLAG_NOARP 0x8000 /* device can't do ARP */
/* init device ... can sleep, or cause probe() failure */ /* init device ... can sleep, or cause probe() failure */
int (*bind)(struct usbnet *, struct usb_interface *); int (*bind)(struct usbnet *, struct usb_interface *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment