OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69d4cfe
)
wl1251: fix TSF calculation
author
Grazvydas Ignotas
<notasas@gmail.com>
Sat, 16 Jun 2012 19:26:46 +0000
(22:26 +0300)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 20 Jun 2012 18:10:24 +0000
(14:10 -0400)
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>
drivers/net/wireless/ti/wl1251/acx.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ti/wl1251/acx.c
b/drivers/net/wireless/ti/wl1251/acx.c
index
ad87a1a
..
db6430c
100644
(file)
--- 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);