X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-atm-vbr.patch;h=28dc14b865786cd36d0e2be9f4f4e410c5017fd4;hb=c4b79b1234275fb7c64ee46dc65b4d229ed41ace;hp=ca4b665cc07bafda2e545d45ed075b6557318493;hpb=2380c4865cc3612d22b7c8f21890de152daf79a1;p=packages%2Fkernel.git

diff --git a/kernel-atm-vbr.patch b/kernel-atm-vbr.patch
index ca4b665c..28dc14b8 100644
--- a/kernel-atm-vbr.patch
+++ b/kernel-atm-vbr.patch
@@ -3,8 +3,8 @@ 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
+--- linux/include/uapi/linux/atm.h	12 Feb 2003 20:56:33 -0000	1.2
++++ linux/include/uapi/linux/atm.h	9 Apr 2003 12:08:38 -0000
 @@ -72,7 +72,7 @@
  			    /* connection identifier range; socket must be
  			       bound or connected */
@@ -76,7 +76,7 @@ diff -u -r1.2 atm.h
 +
 +#define SO_ATMQOS_COMPAT __SO_ENCODE(SOL_ATM,2,struct atm_qos_compat)
 +			    /* Quality of Service setting (no vbr support) */
- #endif
+ #endif /* _UAPI_LINUX_ATM_H */
 Index: linux/net/atm/common.c
 ===================================================================
 RCS file: /afs/cmf/project/cvsroot/linux/net/atm/common.c,v
@@ -125,9 +125,9 @@ diff -u -r1.13 common.c
 +				set_bit(ATM_VF_HASQOS,&vcc->flags);
 +				return 0;
 +			}
- 		case SO_ATMQOS:
- 			{
- 				struct atm_qos qos;
+ 	case SO_ATMQOS:
+ 	{
+ 		struct atm_qos qos;
 @@ -1132,6 +1169,31 @@
  
  	vcc = ATM_SD(sock);
@@ -157,6 +157,6 @@ diff -u -r1.13 common.c
 +				return copy_to_user(optval,&qos_compat,sizeof(qos_compat)) ?
 +				    -EFAULT : 0;
 +			}
- 		case SO_ATMQOS:
- 			if (!test_bit(ATM_VF_HASQOS,&vcc->flags))
- 				return -EINVAL;
+ 	case SO_ATMQOS:
+ 		if (!test_bit(ATM_VF_HASQOS,&vcc->flags))
+ 			return -EINVAL;