[packages/linux-atm] rediff
arekm
arekm at pld-linux.org
Tue Mar 3 00:09:23 CET 2026
commit f489c7d34a9fd0fe24ebfa685dd3c87a0e321897
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 3 00:09:13 2026 +0100
rediff
linux-atm-llh-vbr.patch | 14 +++++-----
vbr-linux-atm-diffs | 68 +++++++++++++++++++------------------------------
2 files changed, 34 insertions(+), 48 deletions(-)
---
diff --git a/linux-atm-llh-vbr.patch b/linux-atm-llh-vbr.patch
index 40aaf8b..603a8b0 100644
--- a/linux-atm-llh-vbr.patch
+++ b/linux-atm-llh-vbr.patch
@@ -1,5 +1,6 @@
---- linux-atm-2.4.1/src/include/atm.h.orig 2004-03-30 23:01:43.000000000 +0200
-+++ linux-atm-2.4.1/src/include/atm.h 2004-03-30 23:17:27.548518848 +0200
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/include/atm.h linux-atm-2.5.2/src/include/atm.h
+--- linux-atm-2.5.2.org/src/include/atm.h 2026-03-03 00:07:47.493541621 +0100
++++ linux-atm-2.5.2/src/include/atm.h 2026-03-03 00:07:47.589825186 +0100
@@ -8,7 +8,7 @@
#include <stdint.h>
@@ -7,10 +8,11 @@
-#include <linux/atm.h>
+#include "linux/atm.h"
-
- /*
---- linux-atm-2.4.1/src/include/linux/atm.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-atm-2.4.1/src/include/linux/atm.h 2004-03-30 23:17:16.516196016 +0200
+ #ifdef __cplusplus
+ extern "C" {
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/include/linux/atm.h linux-atm-2.5.2/src/include/linux/atm.h
+--- linux-atm-2.5.2.org/src/include/linux/atm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-atm-2.5.2/src/include/linux/atm.h 2026-03-03 00:07:47.590034455 +0100
@@ -0,0 +1,279 @@
+/* atm.h - general ATM declarations */
+/* taken from linux-libc-headers-2.6.4.0-1 with VBR modifications */
diff --git a/vbr-linux-atm-diffs b/vbr-linux-atm-diffs
index 2bd012c..6c2174b 100644
--- a/vbr-linux-atm-diffs
+++ b/vbr-linux-atm-diffs
@@ -2,26 +2,22 @@ Index: linux-atm/configure.in
===================================================================
RCS file: /afs/cmf/project/cvsroot/linux-atm/configure.in,v
retrieving revision 1.2
-diff -u -r1.2 configure.in
---- linux-atm/configure.in 3 Jan 2002 01:59:00 -0000 1.2
-+++ linux-atm/configure.in 9 Apr 2003 12:41:37 -0000
-@@ -13,7 +13,7 @@
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/configure.in linux-atm-2.5.2/configure.in
+--- linux-atm-2.5.2.org/configure.in 2010-12-28 16:36:07.000000000 +0100
++++ linux-atm-2.5.2/configure.in 2026-03-03 00:07:31.692017335 +0100
+@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE(linux-atm,2.4.0)
+ AM_INIT_AUTOMAKE(linux-atm,2.5.2)
-LIBVER_CURRENT="1"
+LIBVER_CURRENT="2"
LIBVER_REVISION="0"
LIBVER_AGE="0"
AC_SUBST(LIBVER_CURRENT)
-Index: linux-atm/src/include/atm.h
-===================================================================
-RCS file: /afs/cmf/project/cvsroot/linux-atm/src/include/atm.h,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 atm.h
---- linux-atm/src/include/atm.h 31 Dec 2001 18:03:10 -0000 1.1.1.1
-+++ linux-atm/src/include/atm.h 8 Apr 2003 15:09:19 -0000
-@@ -83,7 +83,7 @@
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/include/atm.h linux-atm-2.5.2/src/include/atm.h
+--- linux-atm-2.5.2.org/src/include/atm.h 2008-01-01 01:14:50.000000000 +0100
++++ linux-atm-2.5.2/src/include/atm.h 2026-03-03 00:07:31.692229489 +0100
+@@ -86,7 +86,7 @@ extern "C" {
#define MAX_ATM_ADDR_LEN (2*ATM_ESA_LEN+ATM_E164_LEN+5)
/* 4 dots, 1 plus */
#define MAX_ATM_NAME_LEN 256 /* wild guess */
@@ -30,13 +26,9 @@ diff -u -r1.1.1.1 atm.h
#define MAX_ATM_SAP_LEN 255 /* BHLI(27)+1+3*BLLI(L2=33,L3=41,+1)+2 */
-Index: linux-atm/src/lib/qos2text.c
-===================================================================
-RCS file: /afs/cmf/project/cvsroot/linux-atm/src/lib/qos2text.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 qos2text.c
---- linux-atm/src/lib/qos2text.c 31 Dec 2001 18:03:11 -0000 1.1.1.1
-+++ linux-atm/src/lib/qos2text.c 8 Apr 2003 14:42:51 -0000
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/lib/qos2text.c linux-atm-2.5.2/src/lib/qos2text.c
+--- linux-atm-2.5.2.org/src/lib/qos2text.c 2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.2/src/lib/qos2text.c 2026-03-03 00:07:31.692388157 +0100
@@ -2,6 +2,7 @@
representation */
@@ -45,7 +37,7 @@ diff -u -r1.1.1.1 qos2text.c
#if HAVE_CONFIG_H
#include <config.h>
-@@ -33,6 +34,8 @@
+@@ -33,6 +34,8 @@ static void params(char *buffer,char **p
FLD(pcr);
FLD(min_pcr);
FLD(max_sdu);
@@ -54,7 +46,7 @@ diff -u -r1.1.1.1 qos2text.c
}
-@@ -71,8 +74,16 @@
+@@ -71,8 +74,16 @@ int qos2text(char *buffer,int length,con
case ATM_CBR:
strcpy(buffer,"cbr");
pos += 3;
@@ -72,13 +64,9 @@ diff -u -r1.1.1.1 qos2text.c
strcpy(buffer,"abr");
pos += 3;
break;
-Index: linux-atm/src/lib/text2qos.c
-===================================================================
-RCS file: /afs/cmf/project/cvsroot/linux-atm/src/lib/text2qos.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 text2qos.c
---- linux-atm/src/lib/text2qos.c 31 Dec 2001 18:03:11 -0000 1.1.1.1
-+++ linux-atm/src/lib/text2qos.c 8 Apr 2003 15:12:52 -0000
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/lib/text2qos.c linux-atm-2.5.2/src/lib/text2qos.c
+--- linux-atm-2.5.2.org/src/lib/text2qos.c 2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.2/src/lib/text2qos.c 2026-03-03 00:07:31.692580601 +0100
@@ -2,6 +2,9 @@
encoding */
@@ -97,7 +85,7 @@ diff -u -r1.1.1.1 text2qos.c
#include "atm.h"
-@@ -86,16 +90,16 @@
+@@ -86,16 +90,16 @@ static int params(const char **text,stru
if (*(*text)++ != ':') return -1;
while (1) {
if (!**text) return -1;
@@ -117,7 +105,7 @@ diff -u -r1.1.1.1 text2qos.c
if (b) b->pcr = value;
break;
case 2:
-@@ -112,6 +116,20 @@
+@@ -112,6 +116,20 @@ static int params(const char **text,stru
if (a) a->max_sdu = value;
if (b) b->max_sdu = value;
break;
@@ -138,7 +126,7 @@ diff -u -r1.1.1.1 text2qos.c
default:
return 0;
}
-@@ -131,20 +149,26 @@
+@@ -131,20 +149,26 @@ int text2qos(const char *text,struct atm
do {
static const unsigned char aal_number[] = { ATM_AAL0, ATM_AAL5 };
int item;
@@ -171,14 +159,10 @@ diff -u -r1.1.1.1 text2qos.c
return -1;
}
}
-Index: linux-atm/src/man/qos.7
-===================================================================
-RCS file: /afs/cmf/project/cvsroot/linux-atm/src/man/qos.7,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 qos.7
---- linux-atm/src/man/qos.7 31 Dec 2001 18:03:11 -0000 1.1.1.1
-+++ linux-atm/src/man/qos.7 8 Apr 2003 15:12:03 -0000
-@@ -19,7 +19,12 @@
+diff -urNp -x '*.orig' linux-atm-2.5.2.org/src/man/qos.7 linux-atm-2.5.2/src/man/qos.7
+--- linux-atm-2.5.2.org/src/man/qos.7 2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.2/src/man/qos.7 2026-03-03 00:07:31.692740071 +0100
+@@ -19,7 +19,12 @@ Unassigned Bit Rate
.IP \fBcbr\fP
Constant Bit Rate
.IP \fBabr\fP
@@ -192,7 +176,7 @@ diff -u -r1.1.1.1 qos.7
.P
The following AAL types are recognized:
.IP \fBaal0\fP
-@@ -50,11 +55,18 @@
+@@ -50,11 +55,18 @@ to link speed may be chosen.
.IP \fBmin_pcr=\fIrate\fP
The lower limit for the peak cell rate to assign. If omitted, any rate above
zero can be chosen.
@@ -211,7 +195,7 @@ diff -u -r1.1.1.1 qos.7
.P
Values are specified as follows:
.IP \fIrate\fP
-@@ -90,6 +102,7 @@
+@@ -90,6 +102,7 @@ Each of the following lines contains a v
CBR:max_pcr=11Mbps,min_pcr=10mbps,sdu=8192
aal5,ubr:tx:none
cbr:tx:pcr=30000,rx:none
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-atm.git/commitdiff/f489c7d34a9fd0fe24ebfa685dd3c87a0e321897
More information about the pld-cvs-commit
mailing list