diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-10 21:42:20 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-10 21:42:20 +0000 |
| commit | 302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80 (patch) | |
| tree | 6165c4e3f986812545bcbf12952840a314a6d4ac /ospf6d | |
| parent | 224a85d77aea7077ce7aec038d7abe3bb3b049ea (diff) | |
| parent | 122e52d3c6f844aceddf1b3b35885d0feae6650a (diff) | |
| download | quagga-302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80.tar.bz2 quagga-302c8d2456ca0a09ac1ff8c07dbd9ba569d85c80.tar.xz | |
Merge branch 'master' of /git/quagga.euro-ix into pthreads
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_interface.c | 17 | ||||
| -rw-r--r-- | ospf6d/ospf6_lsdb.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 2 |
3 files changed, 4 insertions, 19 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 2cd5303f..777bc7c9 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -690,23 +690,6 @@ neighbor_change (struct thread *thread) return 0; } -static int -loopind (struct thread *thread) -{ - struct ospf6_interface *oi; - - oi = (struct ospf6_interface *) THREAD_ARG (thread); - assert (oi && oi->interface); - - if (IS_OSPF6_DEBUG_INTERFACE) - zlog_debug ("Interface Event %s: [LoopInd]", - oi->interface->name); - - /* XXX not yet */ - - return 0; -} - int interface_down (struct thread *thread) { diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c index d2e3e04c..280bdf95 100644 --- a/ospf6d/ospf6_lsdb.c +++ b/ospf6d/ospf6_lsdb.c @@ -381,7 +381,7 @@ ospf6_lsdb_type_router_head (u_int16_t type, u_int32_t adv_router, /* Walk down tree. */ while (node && node->p.prefixlen <= key.prefixlen && prefix_match (&node->p, (struct prefix *) &key)) - node = node->link[prefix_bit(&key.prefix, node->p.prefixlen)]; + node = node->link[prefix6_bit(&key.prefix, node->p.prefixlen)]; if (node) route_lock_node (node); @@ -435,7 +435,7 @@ ospf6_lsdb_type_head (u_int16_t type, struct ospf6_lsdb *lsdb) node = lsdb->table->top; while (node && node->p.prefixlen <= key.prefixlen && prefix_match (&node->p, (struct prefix *) &key)) - node = node->link[prefix_bit(&key.prefix, node->p.prefixlen)]; + node = node->link[prefix6_bit(&key.prefix, node->p.prefixlen)]; if (node) route_lock_node (node); diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index c4cc9fac..82370268 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -143,6 +143,7 @@ ospf6_create (void) return o; } +#if 0 static void ospf6_delete (struct ospf6 *o) { @@ -163,6 +164,7 @@ ospf6_delete (struct ospf6 *o) XFREE (MTYPE_OSPF6_TOP, o); } +#endif static void ospf6_enable (struct ospf6 *o) |