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

Commit c2cef4e8 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net: ipv6: minor: *_start_timer: rather use unsigned long 



For the functions mld_gq_start_timer(), mld_ifc_start_timer(),
and mld_dad_start_timer(), rather use unsigned long than int
as we operate only on unsigned values anyway. This seems more
appropriate as there is no good reason to do type conversions
to int, that could lead to future errors.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84698963

net/ipv6/mcast.c

+5 −5
Original line number Diff line number Diff line
@@ -996,24 +996,24 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group, 


static void mld_gq_start_timer(struct inet6_dev *idev)

{

	int tv = net_random() % idev->mc_maxdelay;

	unsigned long tv = net_random() % idev->mc_maxdelay;



	idev->mc_gq_running = 1;

	if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2))

		in6_dev_hold(idev);

}



static void mld_ifc_start_timer(struct inet6_dev *idev, int delay)

static void mld_ifc_start_timer(struct inet6_dev *idev, unsigned long delay)

{

	int tv = net_random() % delay;

	unsigned long tv = net_random() % delay;



	if (!mod_timer(&idev->mc_ifc_timer, jiffies+tv+2))

		in6_dev_hold(idev);

}



static void mld_dad_start_timer(struct inet6_dev *idev, int delay)

static void mld_dad_start_timer(struct inet6_dev *idev, unsigned long delay)

{

	int tv = net_random() % delay;

	unsigned long tv = net_random() % delay;



	if (!mod_timer(&idev->mc_dad_timer, jiffies+tv+2))

		in6_dev_hold(idev);