diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 09:25:15 +0200 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 09:25:15 +0200 |
| commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
| tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /bgpd/bgp_zebra.h | |
| parent | bgpd: We try to skip out of updating the multipath aggregate if there are no (diff) | |
| parent | lib: pretty ip_masklen and masklen2ip (diff) | |
| download | frr-3cf6c2b4e43f44a977d218c96c26250654ae333e.tar.xz frr-3cf6c2b4e43f44a977d218c96c26250654ae333e.zip | |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'bgpd/bgp_zebra.h')
| -rw-r--r-- | bgpd/bgp_zebra.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_zebra.h b/bgpd/bgp_zebra.h index 461255e39..80991930f 100644 --- a/bgpd/bgp_zebra.h +++ b/bgpd/bgp_zebra.h @@ -31,8 +31,8 @@ extern int bgp_config_write_maxpaths (struct vty *, struct bgp *, afi_t, safi_t, int *); extern int bgp_config_write_redistribute (struct vty *, struct bgp *, afi_t, safi_t, int *); -extern void bgp_zebra_announce (struct prefix *, struct bgp_info *, struct bgp *); -extern void bgp_zebra_withdraw (struct prefix *, struct bgp_info *); +extern void bgp_zebra_announce (struct prefix *, struct bgp_info *, struct bgp *, safi_t); +extern void bgp_zebra_withdraw (struct prefix *, struct bgp_info *, safi_t); extern int bgp_redistribute_set (struct bgp *, afi_t, int); extern int bgp_redistribute_rmap_set (struct bgp *, afi_t, int, const char *); |