Merge pull request #9084 from louis-oui/fix-ospf6-router-id

author Igor Ryzhov <iryzhov@nfware.com>

Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)

committer GitHub <noreply@github.com>

Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)
author Igor Ryzhov <iryzhov@nfware.com>
Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)
committer GitHub <noreply@github.com>
Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)
diff --cc ospf6d/ospf6_top.c
Simple merge
diff --cc ospf6d/ospf6_top.h
Simple merge
diff --cc ospf6d/ospf6_zebra.c
Simple merge
author	Igor Ryzhov <iryzhov@nfware.com>
	Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)
committer	GitHub <noreply@github.com>
	Thu, 23 Sep 2021 16:03:35 +0000 (19:03 +0300)
		1	2
ospf6d/ospf6_top.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_top.h	patch \|	diff1 \|	diff2 \|	blob \| history
ospf6d/ospf6_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history