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:
59e1696
)
net: e1000e: convert to timecounter adjtime.
author
Richard Cochran
<
[email protected]
>
Sun, 21 Dec 2014 18:47:01 +0000
(19:47 +0100)
committer
David S. Miller
<
[email protected]
>
Tue, 30 Dec 2014 23:29:26 +0000
(18:29 -0500)
This patch changes the driver to use the new and improved method
for adjusting the offset of a timecounter.
Signed-off-by: Richard Cochran <
[email protected]
>
Acked-by: Jeff Kirsher <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/intel/e1000e/ptp.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/e1000e/ptp.c
b/drivers/net/ethernet/intel/e1000e/ptp.c
index fb1a914a3ad4dc98cf4da0cfc0ad7271a8a12488..978ef9c4a043f9e9277de439939a75721f4ee5cf 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/ptp.c
+++ b/
drivers/net/ethernet/intel/e1000e/ptp.c
@@
-90,12
+90,9
@@
static int e1000e_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,
ptp_clock_info);
unsigned long flags;
- s64 now;
spin_lock_irqsave(&adapter->systim_lock, flags);
- now = timecounter_read(&adapter->tc);
- now += delta;
- timecounter_init(&adapter->tc, &adapter->cc, now);
+ timecounter_adjtime(&adapter->tc, delta);
spin_unlock_irqrestore(&adapter->systim_lock, flags);
return 0;