diff options
| author | Mitesh Kanjariya <mitesh@cumulusnetworks.com> | 2018-02-27 01:46:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 01:46:26 -0800 |
| commit | 23e386ac714b48872d7d41ad118b12ebbc22984c (patch) | |
| tree | 295c1033f46f99eaacf014dde0b42beb035f1e71 /zebra/zebra_pw.c | |
| parent | 6fb219da876ace4732e31005466cae708e512d42 (diff) | |
| parent | ac3133a35d340a765be1518c2669b979e39fbe66 (diff) | |
Merge branch 'master' into type5-default-originate
Diffstat (limited to 'zebra/zebra_pw.c')
| -rw-r--r-- | zebra/zebra_pw.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index bbd01a759e..96bee36be6 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -294,8 +294,11 @@ void zebra_pw_exit(struct zebra_vrf *zvrf) { struct zebra_pw *pw; - while ((pw = RB_ROOT(zebra_pw_head, &zvrf->pseudowires)) != NULL) + while (!RB_EMPTY(zebra_pw_head, &zvrf->pseudowires)) { + pw = RB_ROOT(zebra_pw_head, &zvrf->pseudowires); + zebra_pw_del(zvrf, pw); + } } DEFUN_NOSH (pseudowire_if, |