Skip to contentSkip to conversation

net: usb: fix regression from 6509141f9c2ba74df6cc72ec35cd1865276ae3a4

PATCH Applied Lucas Stach 2 participants 2 messages Feb 8, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: usb: fix regression from 6509141f9c2ba74df6cc72ec35cd1865276ae3a4

The newly added flag NOARP was using an already defined value, which broke drivers using flag MULTI_PACKET.

---
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(-)
include/linux/usb/usbnet.h +1 -1
index 5de7a22..2cb5fb6 100644
@@ -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 *);
Signature · 1 line
1.8.1
maintainer Applied
#1 lore raw

From: Lucas Stach <[email protected]>
Date: Fri, 8 Feb 2013 03:18:39 +0100

Quoted 4 lines

The newly added flag NOARP was using an already defined value, which broke drivers using flag MULTI_PACKET.

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.

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.