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>
55 lines
1.5 KiB
C
55 lines
1.5 KiB
C
/* net/atm/common.h - ATM sockets (common part for PVC and SVC) */
|
|
|
|
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
|
|
#ifndef NET_ATM_COMMON_H
|
|
#define NET_ATM_COMMON_H
|
|
|
|
#include <linux/net.h>
|
|
#include <linux/poll.h> /* for poll_table */
|
|
|
|
|
|
int vcc_create(struct net *net, struct socket *sock, int protocol, int family);
|
|
int vcc_release(struct socket *sock);
|
|
int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
|
|
int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|
size_t size, int flags);
|
|
int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
|
|
size_t total_len);
|
|
unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
|
|
int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
|
int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
|
int vcc_setsockopt(struct socket *sock, int level, int optname,
|
|
char __user *optval, int optlen);
|
|
int vcc_getsockopt(struct socket *sock, int level, int optname,
|
|
char __user *optval, int __user *optlen);
|
|
|
|
int atmpvc_init(void);
|
|
void atmpvc_exit(void);
|
|
int atmsvc_init(void);
|
|
void atmsvc_exit(void);
|
|
int atm_sysfs_init(void);
|
|
void atm_sysfs_exit(void);
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
int atm_proc_init(void);
|
|
void atm_proc_exit(void);
|
|
#else
|
|
static inline int atm_proc_init(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void atm_proc_exit(void)
|
|
{
|
|
/* nothing */
|
|
}
|
|
#endif /* CONFIG_PROC_FS */
|
|
|
|
/* SVC */
|
|
int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos);
|
|
|
|
void atm_dev_release_vccs(struct atm_dev *dev);
|
|
|
|
#endif
|