diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
| commit | c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8 (patch) | |
| tree | 8db2b6a6ef0a08f6e9d78dde00bf44bf60d09d54 /drivers/net/ethernet/intel/ice/ice_ptp_hw.h | |
| parent | 6c9cfb853063f317b2953c5e852b6bac1eb0cade (diff) | |
| parent | 90ca51e8c654699b672ba61aeaa418dfb3252e5e (diff) | |
| download | linux-c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.6 net-next PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ptp_hw.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h index 13547707b8e3..9aa10b0426fd 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h @@ -9,7 +9,8 @@ enum ice_ptp_tmr_cmd { INIT_INCVAL, ADJ_TIME, ADJ_TIME_AT_TIME, - READ_TIME + READ_TIME, + ICE_PTP_NOP, }; enum ice_ptp_serdes { |