aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-08-20 06:22:01 -0400
committerDavid S. Miller <davem@davemloft.net>2013-08-21 02:52:02 -0400
commitc2cef4e88808cc566956605a39a96080912c0566 (patch)
tree1ce013a2a31027091bf20b3deb4f8237ec1e6d68 /net/ipv6
parent846989635b368c41efd9079ec6fe0e8d2845ec11 (diff)
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/mcast.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 57863e206d56..33f98d9ac376 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -996,24 +996,24 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
996 996
997static void mld_gq_start_timer(struct inet6_dev *idev) 997static void mld_gq_start_timer(struct inet6_dev *idev)
998{ 998{
999 int tv = net_random() % idev->mc_maxdelay; 999 unsigned long tv = net_random() % idev->mc_maxdelay;
1000 1000
1001 idev->mc_gq_running = 1; 1001 idev->mc_gq_running = 1;
1002 if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2)) 1002 if (!mod_timer(&idev->mc_gq_timer, jiffies+tv+2))
1003 in6_dev_hold(idev); 1003 in6_dev_hold(idev);
1004} 1004}
1005 1005
1006static void mld_ifc_start_timer(struct inet6_dev *idev, int delay) 1006static void mld_ifc_start_timer(struct inet6_dev *idev, unsigned long delay)
1007{ 1007{
1008 int tv = net_random() % delay; 1008 unsigned long tv = net_random() % delay;
1009 1009
1010 if (!mod_timer(&idev->mc_ifc_timer, jiffies+tv+2)) 1010 if (!mod_timer(&idev->mc_ifc_timer, jiffies+tv+2))
1011 in6_dev_hold(idev); 1011 in6_dev_hold(idev);
1012} 1012}
1013 1013
1014static void mld_dad_start_timer(struct inet6_dev *idev, int delay) 1014static void mld_dad_start_timer(struct inet6_dev *idev, unsigned long delay)
1015{ 1015{
1016 int tv = net_random() % delay; 1016 unsigned long tv = net_random() % delay;
1017 1017
1018 if (!mod_timer(&idev->mc_dad_timer, jiffies+tv+2)) 1018 if (!mod_timer(&idev->mc_dad_timer, jiffies+tv+2))
1019 in6_dev_hold(idev); 1019 in6_dev_hold(idev);