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 /ospfd/ospf_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 'ospfd/ospf_route.h')
| -rw-r--r-- | ospfd/ospf_route.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ospfd/ospf_route.h b/ospfd/ospf_route.h index 351e014d..0d37436d 100644 --- a/ospfd/ospf_route.h +++ b/ospfd/ospf_route.h @@ -140,7 +140,8 @@ extern void ospf_intra_add_transit (struct route_table *, struct vertex *, extern void ospf_intra_add_stub (struct route_table *, struct router_lsa_link *, struct vertex *, - struct ospf_area *); + struct ospf_area *, + int parent_is_root); extern int ospf_route_cmp (struct ospf *, struct ospf_route *, struct ospf_route *); |