History

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.

Lucas Stach committed 13 years ago

Commit 9c793301 parent 87c084a1 file · +1 −1Browse files

Unified · Split

include/linux/usb/usbnet.h+1−1
@@ -102,7 +102,6 @@ struct driver_info { · 101 unmodified lines
102#define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */102#define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */
103 103
104#define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */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 * Indicates to usbnet, that USB driver accumulates multiple IP packets.107 * Indicates to usbnet, that USB driver accumulates multiple IP packets.
@@ -110,6 +109,7 @@ struct driver_info { · 1 unmodified line
110 */109 */
111#define FLAG_MULTI_PACKET 0x2000110#define FLAG_MULTI_PACKET 0x2000
112#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */111#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */
112#define FLAG_NOARP 0x8000 /* device can't do ARP */
113 113
114 /* init device ... can sleep, or cause probe() failure */114 /* init device ... can sleep, or cause probe() failure */
115 int (*bind)(struct usbnet *, struct usb_interface *);115 int (*bind)(struct usbnet *, struct usb_interface *);