p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
Acked-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Richard Cochran 2015-03-29 23:11:56 +02:00 committed by David S. Miller
parent 15dd95ffe4
commit 5d45186b47
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -13279,7 +13279,7 @@ static int bnx2x_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
return 0; 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); struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
u64 ns; u64 ns;
@ -13296,7 +13296,7 @@ static int bnx2x_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
} }
static int bnx2x_ptp_settime(struct ptp_clock_info *ptp, 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); struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);
u64 ns; u64 ns;
@ -13334,8 +13334,8 @@ static void bnx2x_register_phc(struct bnx2x *bp)
bp->ptp_clock_info.pps = 0; bp->ptp_clock_info.pps = 0;
bp->ptp_clock_info.adjfreq = bnx2x_ptp_adjfreq; bp->ptp_clock_info.adjfreq = bnx2x_ptp_adjfreq;
bp->ptp_clock_info.adjtime = bnx2x_ptp_adjtime; bp->ptp_clock_info.adjtime = bnx2x_ptp_adjtime;
bp->ptp_clock_info.gettime = bnx2x_ptp_gettime; bp->ptp_clock_info.gettime64 = bnx2x_ptp_gettime;
bp->ptp_clock_info.settime = bnx2x_ptp_settime; bp->ptp_clock_info.settime64 = bnx2x_ptp_settime;
bp->ptp_clock_info.enable = bnx2x_ptp_enable; bp->ptp_clock_info.enable = bnx2x_ptp_enable;
bp->ptp_clock = ptp_clock_register(&bp->ptp_clock_info, &bp->pdev->dev); bp->ptp_clock = ptp_clock_register(&bp->ptp_clock_info, &bp->pdev->dev);