diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-09 20:02:27 +0000 |
| commit | 120e91359392aa18f257cd88e77d762c32eb8a4f (patch) | |
| tree | e367f821165554a8dced5e8bcba8a9eedfc69778 /ospf6d/ospf6_route.c | |
| parent | aa04a120d60b4001bb6224a7efd6d49fec7ec622 (diff) | |
| parent | cc2dd9280c4456586080d1cf4537d26c02fa9a36 (diff) | |
| download | quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.bz2 quagga-120e91359392aa18f257cd88e77d762c32eb8a4f.tar.xz | |
Merge remote branch 'quagga/master' of /git/quagga.euro-ix
Diffstat (limited to 'ospf6d/ospf6_route.c')
| -rw-r--r-- | ospf6d/ospf6_route.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index 9832f570..1e1f4fb5 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -706,9 +706,6 @@ ospf6_route_best_next (struct ospf6_route *route) return next; } -/* Macro version of check_bit (). */ -#define CHECK_BIT(X,P) ((((u_char *)(X))[(P) / 8]) >> (7 - ((P) % 8)) & 1) - struct ospf6_route * ospf6_route_match_head (struct prefix *prefix, struct ospf6_route_table *table) @@ -720,7 +717,7 @@ ospf6_route_match_head (struct prefix *prefix, node = table->table->top; while (node && node->p.prefixlen < prefix->prefixlen && prefix_match (&node->p, prefix)) - node = node->link[CHECK_BIT(&prefix->u.prefix, node->p.prefixlen)]; + node = node->link[prefix_bit(&prefix->u.prefix, node->p.prefixlen)]; if (node) route_lock_node (node); |