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:
5ee698e
)
net: ixgbe: convert to timecounter adjtime.
author
Richard Cochran
<
[email protected]
>
Sun, 21 Dec 2014 18:47:03 +0000
(19:47 +0100)
committer
David S. Miller
<
[email protected]
>
Tue, 30 Dec 2014 23:29:27 +0000
(18:29 -0500)
This patch changes the driver to use the new and improved method
for adjusting the offset of a timecounter.
Compile tested only.
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/ixgbe/ixgbe_ptp.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 5fd4b5271f9a19b5df9b06ebb8a1b81fbdbe8eb1..47c29eaaa140d9cf16f2fb533ba57f9497de7e24 100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@
-261,18
+261,9
@@
static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
struct ixgbe_adapter *adapter =
container_of(ptp, struct ixgbe_adapter, ptp_caps);
unsigned long flags;
- u64 now;
spin_lock_irqsave(&adapter->tmreg_lock, flags);
-
- now = timecounter_read(&adapter->tc);
- now += delta;
-
- /* reset the timecounter */
- timecounter_init(&adapter->tc,
- &adapter->cc,
- now);
-
+ timecounter_adjtime(&adapter->tc, delta);
spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
ixgbe_ptp_setup_sdp(adapter);