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 */
+
+#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
+ 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);
+ 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;