Merge svn revision 1048 from Zebra cvs. Also add missing sokopt.h include
to ospf6_network.h.
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index a3728f4..3105081 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -383,7 +383,7 @@
}
void
-ospf6_asbr_routemap_update ()
+ospf6_asbr_routemap_update (char *mapname)
{
int type;
@@ -460,7 +460,7 @@
if (ospf6->rmap[type].name)
{
if (ospf6->rmap[type].map == NULL)
- ospf6_asbr_routemap_update ();
+ ospf6_asbr_routemap_update (NULL);
if (ospf6->rmap[type].map == NULL)
{
zlog_warn ("route-map \"%s\" not found, suppress redistributing",