| Message ID | BANLkTinyWLjVRLKTZB09BZaH2o0gB0p8JA@mail.gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- 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 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 *);
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(-)