This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / atmdev.h

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index b19303d..7ee00c3 100644 (file)
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -147,7 +147,7 @@ struct atm_dev_stats {
 
 struct atm_iobuf {
        int length;
-       void *buffer;
+       void __user *buffer;
 };
 
 /* for ATM_GETCIRANGE / ATM_SETCIRANGE */
@@ -155,8 +155,8 @@ struct atm_iobuf {
 #define ATM_CI_MAX      -1              /* use maximum range of VPI/VCI */
  
 struct atm_cirange {
-       char    vpi_bits;               /* 1..8, ATM_CI_MAX (-1) for maximum */
-       char    vci_bits;               /* 1..16, ATM_CI_MAX (-1) for maximum */
+       signed char     vpi_bits;       /* 1..8, ATM_CI_MAX (-1) for maximum */
+       signed char     vci_bits;       /* 1..16, ATM_CI_MAX (-1) for maximum */
 };
 
 /* for ATM_SETSC; actually taken from the ATM_VF number space */
@@ -391,7 +391,6 @@ struct atm_dev *atm_dev_lookup(int number);
 void atm_dev_deregister(struct atm_dev *dev);
 void shutdown_atm_dev(struct atm_dev *dev);
 void vcc_insert_socket(struct sock *sk);
-void vcc_remove_socket(struct sock *sk);
 
 
 /*