Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 520191bb authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: ipmr: adjust mroute.h style and drop extern 



Remove extra spaces and tabs, adjust function definitions, remove an
unnecessary ifdef (already used below, just move code) and drop extern
from the functions.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06bd6c03

include/linux/mroute.h

+21 −26
Original line number Diff line number Diff line
@@ -9,38 +9,28 @@ 
#ifdef CONFIG_IP_MROUTE

static inline int ip_mroute_opt(int opt)

{

	return (opt >= MRT_BASE) && (opt <= MRT_MAX);

	return opt >= MRT_BASE && opt <= MRT_MAX;

}

#else

static inline int ip_mroute_opt(int opt)

{

	return 0;

}

#endif



#ifdef CONFIG_IP_MROUTE

extern int ip_mroute_setsockopt(struct sock *, int, char __user *, unsigned int);

extern int ip_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

extern int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg);

extern int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);

extern int ip_mr_init(void);

int ip_mroute_setsockopt(struct sock *, int, char __user *, unsigned int);

int ip_mroute_getsockopt(struct sock *, int, char __user *, int __user *);

int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg);

int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);

int ip_mr_init(void);

#else

static inline

int ip_mroute_setsockopt(struct sock *sock,

			 int optname, char __user *optval, unsigned int optlen)

static inline int ip_mroute_setsockopt(struct sock *sock, int optname,

				       char __user *optval, unsigned int optlen)

{

	return -ENOPROTOOPT;

}



static inline

int ip_mroute_getsockopt(struct sock *sock,

			 int optname, char __user *optval, int __user *optlen)

static inline int ip_mroute_getsockopt(struct sock *sock, int optname,

				       char __user *optval, int __user *optlen)

{

	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 __user *arg)

{

	return -ENOIOCTLCMD;

}
@@ -49,6 +39,11 @@ static inline int ip_mr_init(void) 
{

	return 0;

}



static inline int ip_mroute_opt(int opt)

{

	return 0;

}

#endif



struct vif_device {
@@ -105,7 +100,7 @@ struct mfc_cache { 
#endif



struct rtmsg;

extern int ipmr_get_route(struct net *net, struct sk_buff *skb,

int ipmr_get_route(struct net *net, struct sk_buff *skb,

		   __be32 saddr, __be32 daddr,

		   struct rtmsg *rtm, int nowait);

#endif