diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-05 21:32:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-11-07 04:08:55 -0800 |
| commit | 6a9fb9479f2672fa392711735de9e642395c9a14 (patch) | |
| tree | 16a27c604b453ed896b5f276467a233e6b39e78a /include | |
| parent | 4e058063f49f53f6d75f707e36c82edee6d2e919 (diff) | |
| download | op-kernel-dev-6a9fb9479f2672fa392711735de9e642395c9a14.zip op-kernel-dev-6a9fb9479f2672fa392711735de9e642395c9a14.tar.gz | |
[IPV4]: Clean the ip_sockglue.c from some ugly ifdefs
The #idfed CONFIG_IP_MROUTE is sometimes places inside the if-s,
which looks completely bad. Similar ifdefs inside the functions
looks a bit better, but they are also not recommended to be used.
Provide an ifdef-ed ip_mroute_opt() helper to cleanup the code.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mroute.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 7da2cee..35a8277 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -128,6 +128,18 @@ struct igmpmsg #ifdef __KERNEL__ #include <net/sock.h> +#ifdef CONFIG_IP_MROUTE +static inline int ip_mroute_opt(int opt) +{ + return (opt >= MRT_BASE) && (opt <= MRT_BASE + 10); +} +#else +static inline int ip_mroute_opt(int opt) +{ + return 0; +} +#endif + extern int ip_mroute_setsockopt(struct sock *, int, char __user *, 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); |
