[kernel] netfilter: fix compiler warnings in xt_layer7
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.23 / 801-usb_serial_endpoint_size.patch
1 Index: linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c
2 ===================================================================
3 --- linux-2.6.23-rc6.orig/drivers/usb/serial/usb-serial.c 2007-09-21 16:23:52.000000000 +0800
4 +++ linux-2.6.23-rc6/drivers/usb/serial/usb-serial.c 2007-09-21 16:24:09.000000000 +0800
5 @@ -58,6 +58,7 @@
6 drivers depend on it.
7 */
8
9 +static ushort maxSize = 0;
10 static int debug;
11 static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
12 static DEFINE_MUTEX(table_lock);
13 @@ -866,7 +867,7 @@
14 dev_err(&interface->dev, "No free urbs available\n");
15 goto probe_error;
16 }
17 - buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
18 + buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
19 port->bulk_in_size = buffer_size;
20 port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
21 port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
22 @@ -1276,3 +1277,5 @@
23
24 module_param(debug, bool, S_IRUGO | S_IWUSR);
25 MODULE_PARM_DESC(debug, "Debug enabled or not");
26 +module_param(maxSize, ushort,0);
27 +MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");