[ Resent with the correct CC :) and actually following Duncan's comments ]
Hi,
This is the patch to fix the case when snd_padding is not zero, updated
according to Duncan's comments. Also it changes the driver name to reflect
its generic nature.
The patch is against 2.6.10-rc3 with Duncan's patch applied. Please
consider applying and pushing to Linus before 2.6.10-final is out.
drivers/usb/atm/usb_atm.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Signed-off-by: Roman Kagan <[EMAIL PROTECTED]>
--- linux-2.6.10-rc3.debug/drivers/usb/atm/usb_atm.c 2004-12-22
19:30:54.000000000 +0300
+++ linux-2.6.10-rc3.test/drivers/usb/atm/usb_atm.c 2004-12-22
19:31:32.652744999 +0300
@@ -94,7 +94,7 @@
#define DRIVER_AUTHOR "Johan Verrept, Duncan Sands <[EMAIL PROTECTED]>"
#define DRIVER_VERSION "1.8"
-#define DRIVER_DESC "Alcatel SpeedTouch USB driver version " DRIVER_VERSION
+#define DRIVER_DESC "Generic USB ATM/DSL I/O, version " DRIVER_VERSION
static unsigned int num_rcv_urbs = UDSL_DEFAULT_RCV_URBS;
static unsigned int num_snd_urbs = UDSL_DEFAULT_SND_URBS;
@@ -369,10 +369,6 @@
if (!(ctrl->num_cells -= ne) || !(howmany -= ne))
goto out;
- if (instance->snd_padding) {
- memset(target, 0, instance->snd_padding);
- target += instance->snd_padding;
- }
udsl_fill_cell_header(target, ctrl->atm_data.vcc);
target += ATM_CELL_HEADER;
memcpy(target, skb->data, skb->len);
@@ -387,6 +383,10 @@
goto out;
}
+ if (instance->snd_padding) {
+ memset(target, 0, instance->snd_padding);
+ target += instance->snd_padding;
+ }
udsl_fill_cell_header(target, ctrl->atm_data.vcc);
target += ATM_CELL_HEADER;
memset(target, 0, ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
