diff options
| author | David Woodhouse | 2008-12-04 07:12:38 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-12-04 07:12:38 +0100 |
| commit | 8865c418caf4e9dd2c24bdfae3a5a4106e143e60 (patch) | |
| tree | 4d7fac2c74af56c6aaf83b324b349b76c5f949d9 /net/atm/pvc.c | |
| parent | ne-h8300: convert to net_device_ops (diff) | |
| download | kernel-qcow2-linux-8865c418caf4e9dd2c24bdfae3a5a4106e143e60.tar.gz kernel-qcow2-linux-8865c418caf4e9dd2c24bdfae3a5a4106e143e60.tar.xz kernel-qcow2-linux-8865c418caf4e9dd2c24bdfae3a5a4106e143e60.zip | |
atm: 32-bit ioctl compatibility
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>
Diffstat (limited to 'net/atm/pvc.c')
| -rw-r--r-- | net/atm/pvc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/atm/pvc.c b/net/atm/pvc.c index 43e8bf5ed001..e1d22d9430dd 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c @@ -113,6 +113,9 @@ static const struct proto_ops pvc_proto_ops = { .getname = pvc_getname, .poll = vcc_poll, .ioctl = vcc_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = vcc_compat_ioctl, +#endif .listen = sock_no_listen, .shutdown = pvc_shutdown, .setsockopt = pvc_setsockopt, |