diff options
| author | Grazvydas Ignotas <notasas@gmail.com> | 2012-06-16 22:26:46 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-20 14:10:24 -0400 |
| commit | cae6247db0b93673d170bc0e02aff85f53bc422c (patch) | |
| tree | 1b19160a2c1de90d6f6b7900a0fc06b6d824799b | |
| parent | 69d4cfef8befc6ed89e5e3280f3170eb3153d57a (diff) | |
| download | op-kernel-dev-cae6247db0b93673d170bc0e02aff85f53bc422c.zip op-kernel-dev-cae6247db0b93673d170bc0e02aff85f53bc422c.tar.gz | |
wl1251: fix TSF calculation
Cast MSB part of current TSF to u64 to prevent loss of most
significant bits. MSB should also be shifted by 32.
Patch based on old maemo patch by:
Yuri Kululin <ext-yuri.kululin@nokia.com>
Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/acx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl1251/acx.c b/drivers/net/wireless/ti/wl1251/acx.c index ad87a1a..db6430c 100644 --- a/drivers/net/wireless/ti/wl1251/acx.c +++ b/drivers/net/wireless/ti/wl1251/acx.c @@ -869,7 +869,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime) } *mactime = tsf_info->current_tsf_lsb | - (tsf_info->current_tsf_msb << 31); + ((u64)tsf_info->current_tsf_msb << 32); out: kfree(tsf_info); |
