UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2013-08-20 12:22:01 +02:00 committed by David S. Miller
parent 846989635b
commit c2cef4e888
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv6/mcast.c
View File

@ -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) 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; idev->mc_gq_running = 1;
if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2)) if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2))
in6_dev_hold(idev); 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)) if (!mod_timer(&idev->mc_ifc_timer, jiffies+tv+2))
in6_dev_hold(idev); 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)) if (!mod_timer(&idev->mc_dad_timer, jiffies+tv+2))
in6_dev_hold(idev); in6_dev_hold(idev);