diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ripngd/ripng_route.h | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ripngd/ripng_route.h')
| -rw-r--r-- | ripngd/ripng_route.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/ripngd/ripng_route.h b/ripngd/ripng_route.h index db53f148..2f5b7575 100644 --- a/ripngd/ripng_route.h +++ b/ripngd/ripng_route.h @@ -44,16 +44,11 @@ struct ripng_aggregate u_short tag_out; }; -void -ripng_aggregate_increment (struct route_node *rp, struct ripng_info *rinfo); - -void -ripng_aggregate_decrement (struct route_node *rp, struct ripng_info *rinfo); - -int -ripng_aggregate_add (struct prefix *p); - -int -ripng_aggregate_delete (struct prefix *p); +extern void ripng_aggregate_increment (struct route_node *rp, + struct ripng_info *rinfo); +extern void ripng_aggregate_decrement (struct route_node *rp, + struct ripng_info *rinfo); +extern int ripng_aggregate_add (struct prefix *p); +extern int ripng_aggregate_delete (struct prefix *p); #endif /* _ZEBRA_RIPNG_ROUTE_H */ |