You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2003-01-08 12:18:53+01:00, duncan@baldrick.(none)
speedtouch and friends: add GPL notices (yes, the module was released by Alcatel
under the GPL) and fix some typos.
atmsar.c | 146 +++++++++++++++++++++++++++++------------------------------
atmsar.h | 27 +++++++---
speedtouch.c | 72 ++++++++++++++++++-----------
3 files changed, 138 insertions(+), 107 deletions(-)
diff -Nru a/drivers/usb/misc/atmsar.c b/drivers/usb/misc/atmsar.c
--- a/drivers/usb/misc/atmsar.c Wed Jan 8 12:20:08 2003
+++ b/drivers/usb/misc/atmsar.c Wed Jan 8 12:20:08 2003
@@ -1,73 +1,75 @@
+/******************************************************************************
+ * atmsar.c -- General SAR library for ATM devices.
+ *
+ * Copyright (C) 2000, Johan Verrept
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ******************************************************************************/
+
/*
- * General SAR library for ATM devices.
- *
- * Written By Johan Verrept ( [EMAIL PROTECTED] )
- *
- * Copyright (c) 2000, Johan Verrept
- *
- * This code falls under the GNU General Public License, see COPYING for details
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Version 0.2.4A:
- - Version for inclusion in 2.5 series kernel
- - Modifcations by Richard Purdie ([EMAIL PROTECTED])
- - replaced "sarlib" with "atmsar"
- - adaptations for inclusion in kernel tree
-
-Version 0.2.4:
- - Fixed wrong buffer overrun check in atmsar_decode_rawcell()
- reported by Stephen Robinson <[EMAIL PROTECTED]>
- - Fixed bug when input skb did not contain a multple of 52/53 bytes.
- (would happen when the speedtouch device resynced)
- also reported by Stephen Robinson <[EMAIL PROTECTED]>
-
-Version 0.2.3:
- - Fixed wrong allocation size. caused memory corruption in some
- cases. Reported by Vladimir Dergachev <[EMAIL PROTECTED]>
- - Added some comments
-
-Version 0.2.2:
- - Fixed CRCASM (patch from Linus Flannagan <[EMAIL PROTECTED]>)
- - Fixed problem when user did NOT use the ATMSAR_USE_53BYTE_CELL flag.
- (reported by Piers Scannell <[EMAIL PROTECTED]> )
- - No more in-buffer rewriting for cloned buffers.
- - Removed the PII specific CFLAGS in the Makefile.
-
-Version 0.2.1:
- - removed dependancy on alloc_tx. tis presented problems when using
- this with the br2684 code.
-
-Version 0.2:
- - added AAL0 reassembly
- - added alloc_tx support
- - replaced alloc_skb in decode functions to dev_alloc_skb to allow
- calling from interrupt
- - fixed embarassing AAL5 bug. I was setting the pti bit in the wrong
- byte...
- - fixed another emabrassing bug.. picked up the wrong crc type and
- forgot to invert the crc result...
- - fixed AAL5 length calculations.
- - removed automatic skb freeing from encode functions.
- This caused problems because i did kfree_skb it, while it
- needed to be popped. I cannot determine though whether it
- needs to be popped or not. Figu'e it out ye'self ;-)
- - added mru field. This is the buffersize. atmsar_decode_aal0 will
- use when it allocates a receive buffer. A stop gap for real
- buffer management.
-
-Version 0.1:
- - library created.
- - only contains AAL5, AAL0 can be easily added. ( actually, only
- AAL0 reassembly is missing)
-*/
+ * Written by Johan Verrept ([EMAIL PROTECTED])
+ *
+ * 0.2.4A: - Version for inclusion in 2.5 series kernel
+ * - Modifications by Richard Purdie ([EMAIL PROTECTED])
+ * - replaced "sarlib" with "atmsar"
+ * - adaptations for inclusion in kernel tree
+ *
+ * 0.2.4: - Fixed wrong buffer overrun check in atmsar_decode_rawcell()
+ * reported by Stephen Robinson <[EMAIL PROTECTED]>
+ * - Fixed bug when input skb did not contain a multple of 52/53
+ * bytes (would happen when the speedtouch device resynced)
+ * also reported by Stephen Robinson <[EMAIL PROTECTED]>
+ *
+ * 0.2.3: - Fixed wrong allocation size. caused memory corruption in some
+ * cases. Reported by Vladimir Dergachev <[EMAIL PROTECTED]>
+ * - Added some comments
+ *
+ * 0.2.2: - Fixed CRCASM
+ * patch from Linus Flannagan <[EMAIL PROTECTED]>
+ * - Fixed problem when user did NOT use the
+ * ATMSAR_USE_53BYTE_CELL flag.
+ * reported by Piers Scannell <[EMAIL PROTECTED]>
+ * - No more in-buffer rewriting for cloned buffers.
+ * - Removed the PII specific CFLAGS in the Makefile.
+ *
+ * 0.2.1: - removed dependancy on alloc_tx. tis presented problems when
+ * using this with the br2684 code.
+ *
+ * 0.2: - added AAL0 reassembly
+ * - added alloc_tx support
+ * - replaced alloc_skb in decode functions to dev_alloc_skb to
+ * allow calling from interrupt
+ * - fixed embarassing AAL5 bug. I was setting the pti bit in the
+ * wrong byte...
+ * - fixed another emabrassing bug.. picked up the wrong crc type
+ * and forgot to invert the crc result...
+ * - fixed AAL5 length calculations.
+ * - removed automatic skb freeing from encode functions.
+ * This caused problems because i did kfree_skb it, while it
+ * needed to be popped. I cannot determine though whether it
+ * needs to be popped or not. Figu'e it out ye'self ;-)
+ * - added mru field. This is the buffersize. atmsar_decode_aal0
+ * will use when it allocates a receive buffer. A stop gap for
+ * real buffer management.
+ *
+ * 0.1: - library created.
+ * - only contains AAL5, AAL0 can be easily added. (actually, only
+ * AAL0 reassembly is missing)
+ *
+ */
#include "atmsar.h"
@@ -214,7 +216,7 @@
#define crc32( crc, mem, len) calc_crc(mem, len, crc);
-/* initialiation routines. not used at the moment
+/* initialization routines. not used at the moment
* I will avoid these as long as possible !!
*/
@@ -296,7 +298,7 @@
/*
* This gives problems with the ATM layer alloc_tx().
* It is not usable from interrupt context and for
- * some reason this is used in interurpt context
+ * some reason this is used in interrupt context
* with br2684.c
*
if (vcc->alloc_tx)
@@ -581,7 +583,7 @@
vcc->reasBuffer = dev_alloc_skb (vcc->mtu);
/* if alloc fails, we just drop the cell. it is
possible that we can still
- * receive cells on other vcc's
+ * receive cells on other vcc's
*/
if (vcc->reasBuffer) {
/* if (buffer overrun) discard received cells
until now */
diff -Nru a/drivers/usb/misc/atmsar.h b/drivers/usb/misc/atmsar.h
--- a/drivers/usb/misc/atmsar.h Wed Jan 8 12:20:08 2003
+++ b/drivers/usb/misc/atmsar.h Wed Jan 8 12:20:08 2003
@@ -1,15 +1,26 @@
-/*
+#ifndef _ATMSAR_H_
+#define _ATMSAR_H_
+
+/******************************************************************************
+ * atmsar.h -- General SAR library for ATM devices.
*
- * General SAR library for ATM devices.
+ * Copyright (C) 2000, Johan Verrept
*
- * Copyright (c) 2000, Johan Verrept
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
*
- * This code falls under the GNU General Public License, see COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
*
- */
-
-#ifndef _ATMSAR_H_
-#define _ATMSAR_H_
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ******************************************************************************/
#include <linux/kernel.h>
#include <linux/proc_fs.h>
diff -Nru a/drivers/usb/misc/speedtouch.c b/drivers/usb/misc/speedtouch.c
--- a/drivers/usb/misc/speedtouch.c Wed Jan 8 12:20:08 2003
+++ b/drivers/usb/misc/speedtouch.c Wed Jan 8 12:20:08 2003
@@ -1,31 +1,49 @@
+/******************************************************************************
+ * speedtouch.c -- Alcatel SpeedTouch USB xDSL modem driver.
+ *
+ * Copyright (C) 2001, Alcatel
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ******************************************************************************/
+
/*
- * Driver Module for Alcatel SpeedTouch USB xDSL modem
- * Copyright 2001, Alcatel
* Written by Johan Verrept ([EMAIL PROTECTED])
*
-
-1.5A: - Version for inclusion in 2.5 series kernel
- - Modifcations by Richard Purdie ([EMAIL PROTECTED])
- - made compatible with kernel 2.5.6 onwards by changing
- udsl_usb_send_data_context->urb changed to a pointer
- and adding code to alloc and free it
- - remove_wait_queue() added to udsl_atm_processqueue_thread()
-
-1.5: - fixed memory leak when atmsar_decode_aal5 returned NULL.
- (reported by [EMAIL PROTECTED])
-
-1.4: - changed the spin_lock() under interrupt to spin_lock_irqsave()
- - unlink all active send urbs of a vcc that is being closed.
-
-1.3.1: - added the version number
-
-1.3: - Added multiple send urb support
- - fixed memory leak and vcc->tx_inuse starvation bug
- when not enough memory left in vcc.
-
-1.2: - Fixed race condition in udsl_usb_send_data()
-1.1: - Turned off packet debugging
-
+ * 1.5A: - Version for inclusion in 2.5 series kernel
+ * - Modifications by Richard Purdie ([EMAIL PROTECTED])
+ * - made compatible with kernel 2.5.6 onwards by changing
+ * udsl_usb_send_data_context->urb to a pointer and adding code
+ * to alloc and free it
+ * - remove_wait_queue() added to udsl_atm_processqueue_thread()
+ *
+ * 1.5: - fixed memory leak when atmsar_decode_aal5 returned NULL.
+ * (reported by [EMAIL PROTECTED])
+ *
+ * 1.4: - changed the spin_lock() under interrupt to spin_lock_irqsave()
+ * - unlink all active send urbs of a vcc that is being closed.
+ *
+ * 1.3.1: - added the version number
+ *
+ * 1.3: - Added multiple send urb support
+ * - fixed memory leak and vcc->tx_inuse starvation bug
+ * when not enough memory left in vcc.
+ *
+ * 1.2: - Fixed race condition in udsl_usb_send_data()
+ * 1.1: - Turned off packet debugging
+ *
*/
#include <linux/module.h>
@@ -734,7 +752,7 @@
case -ENOENT: /* buffer was unlinked */
case -EILSEQ: /* unplug or timeout */
case -ETIMEDOUT: /* unplug or timeout */
- /*
+ /*
* we don't do anything here and we don't resubmit
*/
return;
@@ -1033,7 +1051,7 @@
#ifdef DEBUG_PACKET
/*******************************************************************************
*
-* Debug
+* Debug
*
*******************************************************************************/
===================================================================
This BitKeeper patch contains the following changesets:
1.902
## Wrapped with gzip_uu ##
begin 664 bkpatch1775
M'XL(`&@)'#X``^U::V_;QA+];/V*0?*A=FI1?(B2Y3Q@Q8_$MXYC2':+``6$
M%;FR"%,DNTO:5N`??\_L4K)LQXW3FQ87:%0#BJC=V7F=LS.C/J<S+=7V6EQE
MD<@:S^E]KLOMM;%(8Y5$%\YZEF=R`\\'>8[GK6D^DRV[N)4F677=])VP@>]/
M1!E-Z5(JO;WF.<'R23DOY/;:8/_=V5%_T&B\?DV[4Y&=RZ$LZ?7K1IFK2YRE
M=T0Y3?/,*97(]$R6PHGRV<URZ8WONC[^"[UNX(:=&Z_CMKLWD1=[GFA[,G;]
M]E:GW;"*[=S3_JZ8P/7<+<\-`\^]<3O!5K>Q1Y[3<WUR@Y;KM=PM\OQM;VL[
M#'YVO6W7I2]+I9\#:KJ-M_1]3=AM1*0+*>,RK^`^D<4T48G,8KU-(H[IW<D1
M97F91%+3^ESJ32JGDF9Y7*62KH0F)5,IM(QI/*=^&HE2IA!99;%49BD$;%BQ
MR35IA)-#E&NG\0MUW4[8.+D-4*/YC:]&PQ5NXPV=*WF^<Z%R,34^@-LX,5J5
M'K=FB8Y:HIQIH9RI]<F6[_E>V'9[-UZWT^O<(!8B]#J30,:A[/F/^/_/I=HH
M>]Y6T+X)VZ'K/4&K6[<[T7W-@J`=^C>^#(*>%T43KRM%U^L\6;7[HE?5<T,W
M>(IZM7D/5'/=GMNY&?=ZXW8<;[4C5W:[O<>R]L_%KJKEMWOMG@'LHUL8P-]7
MZ\<0_'6MW5X(9-UX?J?7,X@.[N,Y:'\%S]TV-;O^WX+H?AS+5>PZ>':07.-9
M#;Z(!G*67_(#)1(PZSE=39-2ZD+PZE_(AN,C-=65^0/83AZ/S%]`[J%+OM=H
MO?BNKP:](%JF"S6;1.]D)I5(:=@?4)J,E5!SFN2*^J<?*):73&P.MIF=NWDQ
M5\GYM*3UW0V"N]U-^D\._].O4BE9E(N%I]-$4Z'R<R5FA'].E)0@MTEY)91\
M2?.\(H0<W!@GNE3)N"HE)2738`M'@SV3R1P/C*Q;JBREFFG*)Y8WC\^6NI]4
MXS2)Z`C*9EH26+?@)WIJ:9>7'T`#(VY8:T$'.22+,LFSER03K%'FNL1G\A>'
MU!(W"5JMBY(55Y07O&G#^C*;4PI.7^YU'G/!K:4Q)9F1/LT+%7-A^E:0I
MC2556DZJ=).PDGX[/'W_\>S4R.L??Z+?^H-!__CTTTNL+J<Y5LA+:64ELR)-
M(!JF`1WEG"WXL#_8?8_U_;>'1X>GGV"$D71P>'J\/QS2P<<!]>FD/S@]W.5J
M@$[.!B<?A_L.G"3EUYP\J:7-<O@R!AB3]#91/B'`&@JF,4W%I42@(YDPF@1%
MR*&GQ!!`/S=F&H'EBC=?4C)AW&[2E0(D00_+"'\INIMTF$7.)H4]&Q<)3TDZ
M20%D:M*P8A%!@$Q^BU*+EW_H$[D^:+?I!6YWD\Z&_=JP[_IJ-7YO[/G4Z34.
MNRZ%KM'N-UA4(J3(VCO`HG7ST:D_[H@8C'@IM#.6&PNGNX[OM/O;:TW>9/*8
M<9QD45J93\@Z%(>$^C)!L7(A5892A%ZL8<,'1EP2&7]I/GR01%.A8D1%Q8FD
M=568?^RH0L^UD\ERH]X);=B3,3T#IX`_GIF8T3-+,L_J52(615E+?Z"4U01$
M:Q!Z:PI;8DGY2G$RC*O)!$`#*RM5911-973!^^U1HUA&>2Q'2EQ%,DW7K8)0
M+U>EI8%A*8LI?#O(QTFF<?8K;9\XJGZR\QD?HMRI+M[4BMOSQQ73OV1M"X!.
M7XP!YYAS$.F<(?6A!,VJM.3,0FZ'?BL,C(3QO.3"\*J&0E%`B)'$&;M25UJF
MA3?U/(,WK?(BU3G]+Q8L?1G<]Z5(T]R&FW3R63J@XXJ+U!EN/5P`40X7&YIC
M!W-5:A2*4,AJ!U?CK4J_IB).9HFB/:G.!6)R2:\N\S2/YV)GEJ!,+A0N3[ZH
M%RZU=Z^I=/%T)K-2KZKJWZJZ.]CM#S^8;85I7B8JGX$ALDK302JR3)P#(:^X
M[]&3'20E4MM>6!)'XO/=*((^QJF<6?_#6F6">/SQE#]P0,QJW'NX"D=GP_U1
M&+S]=+H_VMT_.J))*LZ=!RE%)PF@1D-<9DCAE%[)&7AP)\U+=#2K1A_GEBB3
MK%FGL9+,7EQ8,"`BT)U)-/Y.._6N90V"9#DY/.2$B1BGM'MPU'\W7-PC'\2%
MG"2I=%;]Z&T;=%H!L43BQ2*+0+V9#?ZHO':H-*PJ-8)PZR!M/&14`$:AH"%?
M`VL^;:S\SE:;&&RK!VX;F'-H^_TC%R<+K>5LG,Z7%,#?+8XF717LQOLL8K]G
M@,$VBVB:H#ZTU`&F!U!&MXO*O`9*FE\AA5-3J)DL26"1R>'ZA(E)`2@D%!3C
M95`S9&0[=&@:-2W+TEHK":E/8US*UL%&1,U!P+/C.'>$"O``5P^([EMAIL PROTECTED]
M5*"<Q8*J,$*MA$A%I@FWBG/?EZMS$`EL2S)06VG6\BK$!91R_S2C=HH$1SA@
M<52EEE>=I2MMR$55YC-\%1FZX@)LZ1N9W?6KW6H*EIH&EIDPEN8))08K%RS&
M1H=OWRERSE9I:VL9J(PS-><:ILA!=#$[EH$!XU`?H'9+,H997IU/.<.,SU9V
MZSN;N>+"3@?8/:]^,M4AUSMS^9.6Z81>-C?NY-5,5?"/3'&HL0-_)E<MG@S#
MW;TFA$A=&U>NN]A$2_#E@AI!VV)1M]1R')1+*!$*.A=%7?\P':!XJ3$]$Z`D
MR92V@@P#Q$5E'6$YH+8(5IZE\\45HDUH-RU\N#J&+P"B!"N,C0XJT*BLH-Y\
MTVRT='47;&[EMAIL PROTECTED];HN:*'(\+KD-0[M6^L%\@S$(]+DL[T`%!R+T(#8.50F
M_J*LQQAL"P3T>D:`>8-5AKSYT#RSY(`_LR_);H%G[)+7V!Z"+K#=OJWA!1$+
MS_)=K9F4+(8NH^@G_:==[O0;NMRG#33^FC3/O0E[06?+-+</AE5?;6Z]'C6W
M_J'>]A>R(Y<G=JO3O]"M[GD<88_"QO-D@H9M0J/Z(GT_:CS'9\;^RJ/?_\[.
M=OH-G>U>P(H'-J^?T.#NA2:5J?VO[W/W#*ET'_'$OZ/=W>O!_$//1][_:'N?
M]FI]F=U7)[)/8?AO'PX_>9;YY>&P&_JA>^/Z?MO.,WWOFSF_'5+3[_YC`\VO
M3##-F/MK5\*J+_ZOAIAW\L70??WC"@WYFU/359\-W]+UWO"(F1:-G[7N\6FF
MM[G\A>;''//''/,'H3_I5<\Q_<9>A_P`7<(6^;Y1T7/"?WH<.1.Q&2L5V#OF
M7V!Y:E$/&'&:TT&K`;_&1FK$1`MBM*..6*<C\-Y(RRP>P>5B5#<PS3>5XE$#
M@E[DIKTQO]>B*6-2Y6[2".`%W#K6OQ'+96N\Z,E'5R(I1W]4LI+K&W7?BDWF
M8%2N(Z0%2E)M%HS**?JK>'TYW(4OMY<S@'I*ETIQ8=O6![UMB#/+2O%,Z?CL
MZ,CVF^NKHZO')X<K9YH9K'%3/87219*-8.0%++"$=MOOP9;EUZ-$_:&!F/5%
M8*H,5]`%>XC0Q7+GQWXF>-8PH>#.K^80GCH8SZ:YMJURK4U@>^G:<]!FP7-9
M-1M+M;)P>SEGY*ELPD!9''=O\O30H1P^*--\4UZ/>+*(K:7`?6UZY7%ELX6L
MW[EAEIF9:"Q%3,S8"!)6-%\9:BK&*S(K3A;CU8>9M[Y1[S/VGMHXYI,)X>Z^
MD#Q.@1YUYJ(.#VPE;M[6UEIXY+E!QS1D]OT%[?&.V_\OQ,S.=35[O17%[<X8
,1<1_`;L\1.1Y(@``
`
end
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
