8865c418ca
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
48 lines
996 B
C
48 lines
996 B
C
/* net/atm/resources.h - ATM-related resources */
|
|
|
|
/* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
|
|
#ifndef NET_ATM_RESOURCES_H
|
|
#define NET_ATM_RESOURCES_H
|
|
|
|
#include <linux/atmdev.h>
|
|
#include <linux/mutex.h>
|
|
|
|
|
|
extern struct list_head atm_devs;
|
|
extern struct mutex atm_dev_mutex;
|
|
|
|
int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat);
|
|
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos);
|
|
void atm_dev_seq_stop(struct seq_file *seq, void *v);
|
|
void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos);
|
|
|
|
|
|
int atm_proc_dev_register(struct atm_dev *dev);
|
|
void atm_proc_dev_deregister(struct atm_dev *dev);
|
|
|
|
#else
|
|
|
|
static inline int atm_proc_dev_register(struct atm_dev *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void atm_proc_dev_deregister(struct atm_dev *dev)
|
|
{
|
|
/* nothing */
|
|
}
|
|
|
|
#endif /* CONFIG_PROC_FS */
|
|
|
|
int atm_register_sysfs(struct atm_dev *adev);
|
|
void atm_unregister_sysfs(struct atm_dev *adev);
|
|
#endif
|