From: Yuri Ershov <ext-yuri.ershov@nokia.com>
Date: Wed, 27 Oct 2010 10:44:18 +0000 (+0400)
Subject: wl1251: Fix TSF calculation
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4453384a16b0e190873974652c8d1a1aacf9133f;p=pandora-wifi.git

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 <ext-yuri.kululin@nokia.com>
Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.c b/drivers/net/wireless/wl12xx/wl1251_acx.c
index b87910c..87e0af4 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);