diff options
| author | David S. Miller <davem@davemloft.net> | 2022-02-19 15:35:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-19 15:35:20 +0300 |
| commit | 0033fced48d281d59f35565106e6d78b25a2f6e6 (patch) | |
| tree | ccfb791e2f6aed03e48bea998a5b7e5e9f06f701 /drivers/net/ethernet/intel/ice/ice_ptp.c | |
| parent | 90141edcd53d145e870bca24d0ce0daaa7157e02 (diff) | |
| parent | 5950bdc88dd1d158f2845fdff8fb1de86476806c (diff) | |
| download | linux-0033fced48d281d59f35565106e6d78b25a2f6e6.tar.xz | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2022-02-18
This series contains updates to ice driver only.
Wojciech fixes protocol matching for slow-path switchdev so that all
packets are correctly redirected.
Michal removes accidental unconditional setting of l4 port filtering
flag.
Jake adds locking to protect VF reset and removal to fix various issues
that can be encountered when they race with each other.
Tom Rix propagates an error and initializes a struct to resolve reported
Clang issues.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ptp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index ae291d442539..000c39d163a2 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -1533,9 +1533,12 @@ exit: static int ice_ptp_adjtime_nonatomic(struct ptp_clock_info *info, s64 delta) { struct timespec64 now, then; + int ret; then = ns_to_timespec64(delta); - ice_ptp_gettimex64(info, &now, NULL); + ret = ice_ptp_gettimex64(info, &now, NULL); + if (ret) + return ret; now = timespec64_add(now, then); return ice_ptp_settime64(info, (const struct timespec64 *)&now); |