0a9b0570e9
Pull in the following upstream commits for both CentOS and Debian:7824b13db9/270709323a/dadd2593c7/e8dc364f9f/ See the patches themselves for more details. Closes-Bug: 1983022 Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com> Change-Id: I20f18b17752588b5b031eed88b5e52fb15c830fa
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 0389752e3aecf8d2b2743f16ce1408a58088bea9 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <0389752e3aecf8d2b2743f16ce1408a58088bea9.1630418391.git.Jim.Somerville@windriver.com>
|
|
From: Miroslav Lichvar <mlichvar@redhat.com>
|
|
Date: Mon, 31 May 2021 11:07:52 +0200
|
|
Subject: [PATCH 1/10] clock: Reset state when switching port with same best
|
|
clock.
|
|
|
|
When the best port is changed, but the ID of the best clock doesn't
|
|
change (e.g. a passive port is activated on link failure), reset the
|
|
current delay and other master/link-specific state to avoid the switch
|
|
throwing the clock off.
|
|
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
|
|
[commit 7e8eba5332671abfd95d06dd191059eded1d2cca upstream]
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
clock.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/clock.c b/clock.c
|
|
index c1b0287..d955710 100644
|
|
--- a/clock.c
|
|
+++ b/clock.c
|
|
@@ -1909,7 +1909,7 @@ static void handle_state_decision_event(struct clock *c)
|
|
best_id = c->dds.clockIdentity;
|
|
}
|
|
|
|
- if (!cid_eq(&best_id, &c->best_id)) {
|
|
+ if (!cid_eq(&best_id, &c->best_id) || best != c->best) {
|
|
clock_freq_est_reset(c);
|
|
tsproc_reset(c->tsproc, 1);
|
|
if (!tmv_is_zero(c->initial_delay))
|
|
--
|
|
2.29.2
|
|
|