diff options
| author | Lucas Stach <dev@lynxeye.de> | 2013-02-07 16:18:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-08 01:49:49 -0500 |
| commit | 9c79330d930b5774aed8eb323daebecedce2e245 (patch) | |
| tree | fefaaff294d94dc47f6189550afd8abb0a9bc81d /include/linux/usb/usbnet.h | |
| parent | 87c084a980325d877dc7e388b8f2f26d5d3b4d01 (diff) | |
| download | olio-linux-3.10-9c79330d930b5774aed8eb323daebecedce2e245.tar.xz olio-linux-3.10-9c79330d930b5774aed8eb323daebecedce2e245.zip | |
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>
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -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 0de078d4cdb..0e5ac93bab1 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -102,7 +102,6 @@ struct driver_info { #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ #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. @@ -110,6 +109,7 @@ struct driver_info { */ #define FLAG_MULTI_PACKET 0x2000 #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 */ int (*bind)(struct usbnet *, struct usb_interface *); |