diff --git a/[refs] b/[refs] index 4bd9c178c777..8769923c324c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 717ecc276dadf31cd858d4e56ac71c3cc479fc19 +refs/heads/master: 39a8cbd9ca051fb164db70315e7972de5c153c33 diff --git a/trunk/drivers/ptp/ptp_clock.c b/trunk/drivers/ptp/ptp_clock.c index 966875dcda56..67e628ee0365 100644 --- a/trunk/drivers/ptp/ptp_clock.c +++ b/trunk/drivers/ptp/ptp_clock.c @@ -147,6 +147,7 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx) } else if (tx->modes & ADJ_FREQUENCY) { err = ops->adjfreq(ops, scaled_ppm_to_ppb(tx->freq)); + ptp->dialed_frequency = tx->freq; } return err; diff --git a/trunk/drivers/ptp/ptp_private.h b/trunk/drivers/ptp/ptp_private.h index 4d5b5082c3b1..69d32070cc65 100644 --- a/trunk/drivers/ptp/ptp_private.h +++ b/trunk/drivers/ptp/ptp_private.h @@ -45,6 +45,7 @@ struct ptp_clock { dev_t devid; int index; /* index into clocks.map */ struct pps_device *pps_source; + long dialed_frequency; /* remembers the frequency adjustment */ struct timestamp_event_queue tsevq; /* simple fifo for time stamps */ struct mutex tsevq_mux; /* one process at a time reading the fifo */ wait_queue_head_t tsev_wq;