Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
net: usb: fix regression from FLAG_NOARP code
In commit 6509141f9c2ba74df6cc72ec35cd1865276ae3a4 ("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: Lucas Stach <dev@lynxeye.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Lucas Stach and committed by David S. Miller 9c79330d 87c084a9
+1
-1
include/linux/usb/usbnet.h
+1
-1
include/linux/usb/usbnet.h
···
102
102
#define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */
103
103
104
104
#define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */
105
-
#define FLAG_NOARP 0x2000 /* device can't do ARP */
106
105
107
106
/*
108
107
* Indicates to usbnet, that USB driver accumulates multiple IP packets.
···
109
110
*/
110
111
#define FLAG_MULTI_PACKET 0x2000
111
112
#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */
113
+
#define FLAG_NOARP 0x8000 /* device can't do ARP */
112
114
113
115
/* init device ... can sleep, or cause probe() failure */
114
116
int (*bind)(struct usbnet *, struct usb_interface *);