Update PTP code to match upstream
4 files changed