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

Commit 53d6841d authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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



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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e1859fb

net/ipv4/ipmr.c

+3 −3
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ struct mr_table { 
	struct vif_device	vif_table[MAXVIFS];

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	int			mroute_do_assert;

	int			mroute_do_pim;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)

	int			mroute_reg_vif_num;

#endif
@@ -1289,7 +1289,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi 
			return -EINVAL;

		if (get_user(v, (int __user *)optval))

			return -EFAULT;

		mrt->mroute_do_assert = !!v;

		mrt->mroute_do_assert = v;

		return 0;

	}

#ifdef CONFIG_IP_PIMSM

net/ipv6/ip6mr.c

+3 −3
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ struct mr6_table { 
	struct mif_device	vif6_table[MAXMIFS];

	int			maxvif;

	atomic_t		cache_resolve_queue_len;

	int			mroute_do_assert;

	int			mroute_do_pim;

	bool			mroute_do_assert;

	bool			mroute_do_pim;

#ifdef CONFIG_IPV6_PIMSM_V2

	int			mroute_reg_vif_num;

#endif
@@ -1648,7 +1648,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns 
		int v;

		if (get_user(v, (int __user *)optval))

			return -EFAULT;

		mrt->mroute_do_assert = !!v;

		mrt->mroute_do_assert = v;

		return 0;

	}