diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
| commit | 4e262455a252c700f81df75fb8107d112062bba8 (patch) | |
| tree | fbd55c66eebe78ccb60424e560548d1613aa403a /ospf6d/ospf6d.c | |
| parent | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
bgpd/bgp_evpn.c
Diffstat (limited to 'ospf6d/ospf6d.c')
| -rw-r--r-- | ospf6d/ospf6d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index bbc1cc18f6..58a39156da 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -387,8 +387,8 @@ DEFUN_HIDDEN (show_ipv6_ospf6_database_aggr_router, lsdb = oa->lsdb_self; else lsdb = oa->lsdb; - if (ospf6_create_single_router_lsa(oa, lsdb, - adv_router) == NULL) { + if (ospf6_create_single_router_lsa(oa, lsdb, adv_router) + == NULL) { vty_out(vty, "Adv router is not found in LSDB."); return CMD_SUCCESS; } |