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

Commit cc57ac53 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Johannes Berg
Browse files

mesh_plink: use msecs_to_jiffies for proper time conversion 



This is primarily an API consolidation and should make things more readable
it replaces var * HZ / 1000 by msecs_to_jiffies(var) which also handles
corner cases correctly.

There is a change of behavior as e.g. for HZ 100, t * HZ / 1000 will
return 0 for t < 10 but msecs_to_jiffies will return at least 1 always.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 64a8cef4

net/mac80211/mesh_plink.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define PLINK_GET_PLID(p) (p + 4)



#define mod_plink_timer(s, t) (mod_timer(&s->plink_timer, \

				jiffies + HZ * t / 1000))

				jiffies + msecs_to_jiffies(t)))



enum plink_event {

	PLINK_UNDEFINED,
@@ -623,7 +623,7 @@ static void mesh_plink_timer(unsigned long data) 


static inline void mesh_plink_timer_set(struct sta_info *sta, int timeout)

{

	sta->plink_timer.expires = jiffies + (HZ * timeout / 1000);

	sta->plink_timer.expires = jiffies + msecs_to_jiffies(timeout);

	sta->plink_timer.data = (unsigned long) sta;

	sta->plink_timer.function = mesh_plink_timer;

	sta->plink_timeout = timeout;