projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
981e25c
)
i40e: fix up 32 bit timespec references
author
Jesse Brandeburg
<
[email protected]
>
Tue, 20 Jun 2017 22:16:56 +0000
(15:16 -0700)
committer
Jeff Kirsher
<
[email protected]
>
Wed, 26 Jul 2017 10:25:19 +0000
(
03:25
-0700)
As it turns out there was only a small set of errors
on 32 bit, and we just needed to be using the right calls
for dealing with timespec64 variables.
Signed-off-by: Jesse Brandeburg <
[email protected]
>
Tested-by: Andrew Bowers <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/i40e/i40e_ptp.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
index 1a0be835fa060882a8da1b987980a3e9a2cc8a8f..0129ed3b78ecd80690a435acaffc9fcec990cdac 100644
(file)
--- a/
drivers/net/ethernet/intel/i40e/i40e_ptp.c
+++ b/
drivers/net/ethernet/intel/i40e/i40e_ptp.c
@@
-158,13
+158,12
@@
static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
static int i40e_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
{
struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps);
- struct timespec64 now
, then
;
+ struct timespec64 now;
- then = ns_to_timespec64(delta);
mutex_lock(&pf->tmreg_lock);
i40e_ptp_read(pf, &now);
-
now = timespec64_add(now, then
);
+
timespec64_add_ns(&now, delta
);
i40e_ptp_write(pf, (const struct timespec64 *)&now);
mutex_unlock(&pf->tmreg_lock);