summaryrefslogtreecommitdiffstats
path: root/ospfd/ospf_zebra.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-02-05 01:40:40 +0100
committerDavid Lamparter <equinox@diac24.net>2010-02-05 01:40:40 +0100
commitf06277c84f7604b380bdac491e23c848d4952d18 (patch)
tree41a46707f2780d48893140e42ca3988fc761242f /ospfd/ospf_zebra.c
parent447a9a8dbde95fc6ce92691491ac193f0199e2cd (diff)
parent590f04362a6dd546e868b5160a72443ce97547ca (diff)
downloadquagga-f06277c84f7604b380bdac491e23c848d4952d18.tar.bz2
quagga-f06277c84f7604b380bdac491e23c848d4952d18.tar.xz
Merge branch 'patches/smallones' into dn42
Diffstat (limited to 'ospfd/ospf_zebra.c')
-rw-r--r--ospfd/ospf_zebra.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index ed35cc80..bcc8905f 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -133,8 +133,9 @@ ospf_interface_delete (int command, struct zclient *zclient,
if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))
zlog_debug
- ("Zebra: interface delete %s index %d flags %lld metric %d mtu %d",
- ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu);
+ ("Zebra: interface delete %s index %d flags %#llx metric %d mtu %d",
+ ifp->name, ifp->ifindex, (unsigned long long) ifp->flags,
+ ifp->metric, ifp->mtu);
#ifdef HAVE_SNMP
ospf_snmp_if_delete (ifp);
@@ -975,7 +976,7 @@ ospf_distribute_list_update_timer (struct thread *thread)
/* Update distribute-list and set timer to apply access-list. */
void
-ospf_distribute_list_update (struct ospf *ospf, int type)
+ospf_distribute_list_update (struct ospf *ospf, unsigned long type)
{
struct route_table *rt;