Author: glen Date: Tue Apr 8 23:17:40 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update from linux-2.6-atm-vbr.patch,1.1
---- Files affected:
SOURCES:
kernel-desktop-atm-vbr.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-atm-vbr.patch
diff -u SOURCES/kernel-desktop-atm-vbr.patch:1.1
SOURCES/kernel-desktop-atm-vbr.patch:1.2
--- SOURCES/kernel-desktop-atm-vbr.patch:1.1 Mon Jun 19 14:35:40 2006
+++ SOURCES/kernel-desktop-atm-vbr.patch Wed Apr 9 01:17:35 2008
@@ -1,7 +1,11 @@
-diff -Nur linux-2.6.17/include/linux/atm.h linux-2.6.17.vbr/include/linux/atm.h
---- linux-2.6.17/include/linux/atm.h 2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.17.vbr/include/linux/atm.h 2006-06-19 12:26:00.000000000
+0000
-@@ -73,7 +73,7 @@
+Index: linux/include/linux/atm.h
+===================================================================
+RCS file: /afs/cmf/project/cvsroot/linux/include/linux/atm.h,v
+retrieving revision 1.2
+diff -u -r1.2 atm.h
+--- linux/include/linux/atm.h 12 Feb 2003 20:56:33 -0000 1.2
++++ linux/include/linux/atm.h 9 Apr 2003 12:08:38 -0000
+@@ -72,7 +72,7 @@
/* connection identifier range; socket must be
bound or connected */
#define SO_ATMQOS __SO_ENCODE(SOL_ATM,2,struct atm_qos)
@@ -10,7 +14,7 @@
#define SO_ATMSAP __SO_ENCODE(SOL_ATM,3,struct atm_sap)
/* Service Access Point */
#define SO_ATMPVC __SO_ENCODE(SOL_ATM,4,struct sockaddr_atmpvc)
-@@ -129,9 +129,11 @@
+@@ -127,9 +127,11 @@
#define ATM_NONE 0 /* no traffic */
#define ATM_UBR 1
#define ATM_CBR 2
@@ -23,7 +27,7 @@
#define ATM_MAX_PCR -1 /* maximum available PCR */
-@@ -142,6 +144,11 @@
+@@ -140,6 +142,11 @@
int min_pcr; /* minimum PCR in cells per second */
int max_cdv; /* maximum CDV in microseconds */
int max_sdu; /* maximum SDU in bytes */
@@ -35,18 +39,10 @@
/* extra params for ABR */
unsigned int icr; /* Initial Cell Rate (24-bit) */
unsigned int tbe; /* Transient Buffer Exposure (24-bit)
*/
-@@ -166,6 +173,7 @@
- unsigned char aal __ATM_API_ALIGN;
+@@ -243,4 +251,37 @@
};
-+
- /* PVC addressing */
-
- #define ATM_ITF_ANY -1 /* "magic" PVC address values */
-@@ -228,6 +236,39 @@
- return addr.sap_addr.itf || addr.sap_addr.vpi || addr.sap_addr.vci;
- }
-
+ typedef unsigned short atm_backend_t;
+struct atm_trafprm_compat {
+ unsigned char traffic_class; /* traffic class (ATM_UBR, ...) */
+ int max_pcr; /* maximum PCR in cells per second */
@@ -80,13 +76,15 @@
+
+#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat)
+ /* Quality of Service setting (no vbr support) */
-
- /*
- * Some stuff for linux/sockios.h
-diff -Nur linux-2.6.17/net/atm/common.c linux-2.6.17.vbr/net/atm/common.c
---- linux-2.6.17/net/atm/common.c 2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.17.vbr/net/atm/common.c 2006-06-19 12:26:00.000000000 +0000
-@@ -698,6 +698,43 @@
+ #endif
+Index: linux/net/atm/common.c
+===================================================================
+RCS file: /afs/cmf/project/cvsroot/linux/net/atm/common.c,v
+retrieving revision 1.13
+diff -u -r1.13 common.c
+--- linux/net/atm/common.c 17 Mar 2003 16:13:12 -0000 1.13
++++ linux/net/atm/common.c 9 Apr 2003 12:10:28 -0000
+@@ -1085,6 +1085,43 @@
vcc = ATM_SD(sock);
switch (optname) {
@@ -130,7 +128,7 @@
case SO_ATMQOS:
{
struct atm_qos qos;
-@@ -742,6 +779,31 @@
+@@ -1132,6 +1169,31 @@
vcc = ATM_SD(sock);
switch (optname) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-atm-vbr.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
