lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv4/ipmr and ipv6/ip6mr: Convert int mroute_do_<foo> to bool

Browse Source 
Save a few bytes per table by convert mroute_do_assert and
mroute_do_pim from int to bool.

Remove !! as the compiler does that when assigning int to bool.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2012-11-25 09:35:30 +00:00
committed by David S. Miller
parent 5e1859fbcc
commit 53d6841d22
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/ipmr.c
View File

@@ -83,8 +83,8 @@ struct mr_table {
struct vif_device vif_table[MAXVIFS]; struct vif_device vif_table[MAXVIFS];
int maxvif; int maxvif;
atomic_t cache_resolve_queue_len; atomic_t cache_resolve_queue_len;
int mroute_do_assert; bool mroute_do_assert;
int mroute_do_pim; bool mroute_do_pim;
#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2) #if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
int mroute_reg_vif_num; int mroute_reg_vif_num;
#endif #endif
@@ -1289,7 +1289,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
return -EINVAL; return -EINVAL;
if (get_user(v, (int __user *)optval)) if (get_user(v, (int __user *)optval))
return -EFAULT; return -EFAULT;
mrt->mroute_do_assert = !!v; mrt->mroute_do_assert = v;
return 0; return 0;
} }
#ifdef CONFIG_IP_PIMSM #ifdef CONFIG_IP_PIMSM

6
net/ipv6/ip6mr.c
View File

@@ -66,8 +66,8 @@ struct mr6_table {
struct mif_device vif6_table[MAXMIFS]; struct mif_device vif6_table[MAXMIFS];
int maxvif; int maxvif;
atomic_t cache_resolve_queue_len; atomic_t cache_resolve_queue_len;
int mroute_do_assert; bool mroute_do_assert;
int mroute_do_pim; bool mroute_do_pim;
#ifdef CONFIG_IPV6_PIMSM_V2 #ifdef CONFIG_IPV6_PIMSM_V2
int mroute_reg_vif_num; int mroute_reg_vif_num;
#endif #endif
@@ -1648,7 +1648,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
int v; int v;
if (get_user(v, (int __user *)optval)) if (get_user(v, (int __user *)optval))
return -EFAULT; return -EFAULT;
mrt->mroute_do_assert = !!v; mrt->mroute_do_assert = v;
return 0; return 0;
} }