diff options
| author | huajun li <huajun.li.lee@gmail.com> | 2011-04-13 15:43:32 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-14 07:22:27 (GMT) |
| commit | 38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9 (patch) | |
| tree | 06cb5dc48a0f749e975c0fe6f4ffab5e15c74a07 /include | |
| parent | 3e8c806a08c7beecd972e7ce15c570b9aba64baa (diff) | |
| download | linux-fsl-qoriq-38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9.tar.xz | |
usbnet: Fix up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | 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 *); |