From 3664e061b609a13a0c6efeef0e435aac14b77059 Mon Sep 17 00:00:00 2001 From: Yuri Ershov Date: Wed, 27 Oct 2010 14:44:18 +0400 Subject: [PATCH] wl1251: Fix TSF calculation Cast MSB part of current TSF to unsigned long long to prevent loss of significant bits. MSB should be shifted on 32 bits. Signed-off-by: Yuri Kululin Signed-off-by: Yuri Ershov --- drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.c b/drivers/net/wireless/wl12xx/wl1251_acx.c index 3c04c95..d22e6a4 100644 --- a/drivers/net/wireless/wl12xx/wl1251_acx.c +++ b/drivers/net/wireless/wl12xx/wl1251_acx.c @@ -847,7 +847,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime) } *mactime = tsf_info->current_tsf_lsb | - (tsf_info->current_tsf_msb << 31); + ((unsigned long long) tsf_info->current_tsf_msb << 32); out: kfree(tsf_info); -- 2.39.2