]>
Commit | Line | Data |
---|---|---|
d1c0ba0d JR |
1 | --- igb-5.3.2/src/igb_ptp.c~ 2015-05-26 23:59:51.000000000 +0200 |
2 | +++ igb-5.3.2/src/igb_ptp.c 2015-06-29 08:05:18.930401431 +0200 | |
3 | @@ -327,7 +327,7 @@ | |
4 | } | |
5 | ||
6 | static int igb_ptp_gettime64_82576(struct ptp_clock_info *ptp, | |
7 | - struct timespec *ts64) | |
8 | + struct timespec64 *ts64) | |
9 | { | |
10 | struct igb_adapter *igb = container_of(ptp, struct igb_adapter, | |
11 | ptp_caps); | |
12 | @@ -350,7 +350,7 @@ | |
13 | } | |
14 | ||
15 | static int igb_ptp_gettime64_i210(struct ptp_clock_info *ptp, | |
16 | - struct timespec *ts64) | |
17 | + struct timespec64 *ts64) | |
18 | { | |
19 | struct igb_adapter *igb = container_of(ptp, struct igb_adapter, | |
20 | ptp_caps); | |
21 | @@ -369,7 +369,7 @@ | |
22 | ||
23 | #ifdef HAVE_PTP_CLOCK_INFO_GETTIME64 | |
24 | static int igb_ptp_settime64_82576(struct ptp_clock_info *ptp, | |
25 | - const struct timespec *ts64) | |
26 | + const struct timespec64 *ts64) | |
27 | { | |
28 | struct igb_adapter *igb = container_of(ptp, struct igb_adapter, | |
29 | ptp_caps); | |
30 | @@ -392,7 +392,7 @@ | |
31 | ||
32 | #endif | |
33 | static int igb_ptp_settime64_i210(struct ptp_clock_info *ptp, | |
34 | - const struct timespec *ts64) | |
35 | + const struct timespec64 *ts64) | |
36 | { | |
37 | struct igb_adapter *igb = container_of(ptp, struct igb_adapter, | |
38 | ptp_caps); | |
7d4abbb5 JR |
39 | @@ -522,7 +522,7 @@ |
40 | { | |
41 | struct igb_adapter *igb = | |
42 | container_of(work, struct igb_adapter, ptp_overflow_work.work); | |
43 | - struct timespec ts; | |
44 | + struct timespec64 ts; | |
45 | ||
46 | igb_ptp_gettime64_82576(&igb->ptp_caps, &ts); | |
47 | ||
48 | @@ -961,7 +961,7 @@ | |
49 | ||
50 | /* Initialize the clock and overflow work for devices that need it. */ | |
51 | if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) { | |
52 | - struct timespec ts = ktime_to_timespec(ktime_get_real()); | |
08b9df66 | 53 | + struct timespec64 ts = ktime_to_timespec64(ktime_get_real()); |
7d4abbb5 JR |
54 | |
55 | igb_ptp_settime64_i210(&adapter->ptp_caps, &ts); | |
56 | } else { | |
57 | @@ -1073,7 +1073,7 @@ | |
58 | ||
59 | /* Re-initialize the timer. */ | |
60 | if ((hw->mac.type == e1000_i210) || (hw->mac.type == e1000_i211)) { | |
61 | - struct timespec ts = ktime_to_timespec(ktime_get_real()); | |
62 | + struct timespec64 ts = ktime_to_timespec64(ktime_get_real()); | |
63 | ||
64 | igb_ptp_settime64_i210(&adapter->ptp_caps, &ts); | |
65 | } else { |