diff options
Diffstat (limited to 'include/linux/mroute.h')
| -rw-r--r-- | include/linux/mroute.h | 11 | 
1 files changed, 9 insertions, 2 deletions
| diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 80b8400ab8b2..4c5003afee6c 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -18,10 +18,11 @@ static inline int ip_mroute_opt(int opt)  int ip_mroute_setsockopt(struct sock *, int, sockptr_t, unsigned int);  int ip_mroute_getsockopt(struct sock *, int, sockptr_t, sockptr_t); -int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg); +int ipmr_ioctl(struct sock *sk, int cmd, void *arg);  int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);  int ip_mr_init(void);  bool ipmr_rule_default(const struct fib_rule *rule); +int ipmr_sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);  #else  static inline int ip_mroute_setsockopt(struct sock *sock, int optname,  				       sockptr_t optval, unsigned int optlen) @@ -35,7 +36,7 @@ static inline int ip_mroute_getsockopt(struct sock *sk, int optname,  	return -ENOPROTOOPT;  } -static inline int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg) +static inline int ipmr_ioctl(struct sock *sk, int cmd, void *arg)  {  	return -ENOIOCTLCMD;  } @@ -54,6 +55,12 @@ static inline bool ipmr_rule_default(const struct fib_rule *rule)  {  	return true;  } + +static inline int ipmr_sk_ioctl(struct sock *sk, unsigned int cmd, +				void __user *arg) +{ +	return 1; +}  #endif  #define VIFF_STATIC 0x8000 |