diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-04-09 13:52:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 13:52:34 -0400 |
| commit | 674ab30a5ddda85d77839686ea4cb419256dc234 (patch) | |
| tree | c4a07a321b68fb4466dd4e314e84739aca8a4342 | |
| parent | fe09938b2b38e091bef84ca8798f55d5544105f6 (diff) | |
| parent | 6920fd019038bb31bda11b6acd0c855f9547df71 (diff) | |
Merge pull request #4108 from pacovn/201904_6.0__lm_aliasing_fixes
zebra: label manager race condition fix (6.0 branch)
| -rw-r--r-- | zebra/label_manager.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c index 65c85f7dee..1dba0a49f7 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -155,11 +155,9 @@ static int lm_zclient_read(struct thread *t) /* read response and send it back */ ret = relay_response_back(); - /* on error, schedule another read */ - if (ret == -1) - if (!zclient->t_read) - thread_add_read(zclient->master, lm_zclient_read, NULL, - zclient->sock, &zclient->t_read); + /* re-arm read */ + thread_add_read(zclient->master, lm_zclient_read, NULL, + zclient->sock, &zclient->t_read); return ret; } |