From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
owner@vger.kernel.org] On Behalf Of Richard Cochran
Sent: Sunday, March 29, 2015 2:12 PM
To: netdev
Cc: linux-kernel; Amir Vadai; Ariel Elior; Arnd Bergmann; Baolin
Wang; Ben Hutchings; Bruce Allan; Carolyn Wyborny; Chris
Metcalf; David Miller; Frank Li; Giuseppe Cavallaro; Jacob Keller;
Jeff Kirsher; John Stultz; Luwei Zhou; Matthew Vick; Michael
Chan; Prashant Sreedharan; Rayagond K; Shradha Shah;
Solarflare linux maintainers; Sonic Zhang; Stefan Sørensen;
Thomas Gleixner; Tom Lendacky
Subject: [PATCH net-next V3 06/23] ptp: bnx2x: convert to the 64
bit get/set time methods.

This driver's clock is implemented using a timecounter, and so
with this patch the driver is ready for the year 2038.

Compile tested only.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c |    8
++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 9677431..765667c 100644

--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

@@ -13278,7 +13278,7 @@ static int bnx2x_ptp_adjtime(struct

ptp_clock_info *ptp, s64 delta)
 	return 0;
 }

-static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct
timespec *ts)
+static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct
+timespec64 *ts)
 {
 	struct bnx2x *bp = container_of(ptp, struct bnx2x,
ptp_clock_info);
 	u64 ns;

@@ -13295,7 +13295,7 @@ static int bnx2x_ptp_gettime(struct

ptp_clock_info *ptp, struct timespec *ts)  }

 static int bnx2x_ptp_settime(struct ptp_clock_info *ptp,
-			     const struct timespec *ts)
+			     const struct timespec64 *ts)
 {
 	struct bnx2x *bp = container_of(ptp, struct bnx2x,
ptp_clock_info);
 	u64 ns;

@@ -13333,8 +13333,8 @@ static void

bnx2x_register_phc(struct bnx2x *bp)
 	bp->ptp_clock_info.pps = 0;
 	bp->ptp_clock_info.adjfreq = bnx2x_ptp_adjfreq;
 	bp->ptp_clock_info.adjtime = bnx2x_ptp_adjtime;
-	bp->ptp_clock_info.gettime = bnx2x_ptp_gettime;
-	bp->ptp_clock_info.settime = bnx2x_ptp_settime;
+	bp->ptp_clock_info.gettime64 = bnx2x_ptp_gettime;
+	bp->ptp_clock_info.settime64 = bnx2x_ptp_settime;
 	bp->ptp_clock_info.enable = bnx2x_ptp_enable;