* [PATCH] Clean up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps in usbnet.h
@ 2011-04-14 1:43 huajun li
2011-04-14 7:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: huajun li @ 2011-04-14 1:43 UTC (permalink / raw)
To: David Miller; +Cc: Gottfried Haider, netdev
USB tethering does not work anymore since 2.6.39-rc2, but it's okay in
-rc1. The root cause is the new added mask code 'FLAG_POINTTOPOINT'
overlaps 'FLAG_MULTI_PACKET' in include/linux/usb/usbnet.h, this
causes logic issue in rx_process(). This patch cleans up the overlap.
Reported-and-Tested-by: Gottfried Haider <gottfried.haider@gmail.com>
Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
---
include/linux/usb/usbnet.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 3c7329b..0e18550 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -103,8 +103,8 @@ struct driver_info {
* Indicates to usbnet, that USB driver accumulates multiple IP packets.
* Affects statistic (counters) and short packet handling.
*/
-#define FLAG_MULTI_PACKET 0x1000
-#define FLAG_RX_ASSEMBLE 0x2000 /* rx packets may span >1 frames */
+#define FLAG_MULTI_PACKET 0x2000
+#define FLAG_RX_ASSEMBLE 0x4000 /* rx packets may span >1 frames */
/* init device ... can sleep, or cause probe() failure */
int (*bind)(struct usbnet *, struct usb_interface *);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Clean up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps in usbnet.h
2011-04-14 1:43 [PATCH] Clean up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps in usbnet.h huajun li
@ 2011-04-14 7:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-04-14 7:22 UTC (permalink / raw)
To: huajun.li.lee; +Cc: gottfried.haider, netdev
From: huajun li <huajun.li.lee@gmail.com>
Date: Thu, 14 Apr 2011 09:43:32 +0800
> USB tethering does not work anymore since 2.6.39-rc2, but it's okay in
> -rc1. The root cause is the new added mask code 'FLAG_POINTTOPOINT'
> overlaps 'FLAG_MULTI_PACKET' in include/linux/usb/usbnet.h, this
> causes logic issue in rx_process(). This patch cleans up the overlap.
>
> Reported-and-Tested-by: Gottfried Haider <gottfried.haider@gmail.com>
> Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-14 7:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-14 1:43 [PATCH] Clean up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps in usbnet.h huajun li
2011-04-14 7:22 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.