| Message ID | 1360289919-20409-1-git-send-email-dev@lynxeye.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Lucas Stach <dev@lynxeye.de> Date: Fri, 8 Feb 2013 03:18:39 +0100 > 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> Applied, but I reworked your commit message like so: 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> References to commit IDs are ambiguous because a change can go into multiple GIT trees. Therefore we don't reference them in commit header lines, and when we reference them in the commit body we postfix them with the commit header line of the referenced commit (in parenthesis and quotes) in order to eliminate the ambiguity. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 5de7a22..2cb5fb6 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -100,7 +100,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. @@ -108,6 +107,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 *);
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> --- As the regressing patch went in with v3.8-rc5, this fix should go to mainline ASAP. --- include/linux/usb/usbnet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)