diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /lib/plist.c | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'lib/plist.c')
| -rw-r--r-- | lib/plist.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/plist.c b/lib/plist.c index a95749cf0e..9dd5e561a7 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1230,8 +1230,8 @@ static int vty_show_prefix_list_prefix(struct vty *vty, afi_t afi, match = 1; if (type == longer_display) { - if ((p.family == pentry->prefix.family) && - (prefix_match(&p, &pentry->prefix))) + if ((p.family == pentry->prefix.family) + && (prefix_match(&p, &pentry->prefix))) match = 1; } @@ -1310,8 +1310,8 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name, for (pentry = plist->head; pentry; pentry = pentry->next) { if (prefix) { - if (pentry->prefix.family == p.family && - prefix_match(&pentry->prefix, &p)) + if (pentry->prefix.family == p.family + && prefix_match(&pentry->prefix, &p)) pentry->hitcnt = 0; } else pentry->hitcnt = 0; |