From: Nicholas Mc Guire Date: Mon, 2 Mar 2015 09:54:14 +0000 (-0500) Subject: mesh_plink: fixup type of timeout to match usage X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0df2f6c11813a3e522f72f6998b00ae8e17dd4df;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git mesh_plink: fixup type of timeout to match usage timeout was being passed as int but assigned from u32/u16 values and used as unsigned type. This is really only for better readability. Signed-off-by: Nicholas Mc Guire Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 4eefd5df5b05..8465c055a371 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -621,7 +621,7 @@ static void mesh_plink_timer(unsigned long data) sta->llid, sta->plid, reason); } -static inline void mesh_plink_timer_set(struct sta_info *sta, int timeout) +static inline void mesh_plink_timer_set(struct sta_info *sta, u32 timeout) { sta->plink_timer.expires = jiffies + msecs_to_jiffies(timeout); sta->plink_timer.data = (unsigned long) sta;