diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-05-27 15:31:06 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-05-27 15:31:06 +0200 |
| commit | 52a51fd333258529aa98a0d35e7bf757cc645f2b (patch) | |
| tree | a0804b7b7f3093d3b9c1b6682af6567c314a7431 /bgpd/bgp_attr.h | |
| parent | vtysh: Fix compile failure from cherry-pick (diff) | |
| download | frr-52a51fd333258529aa98a0d35e7bf757cc645f2b.tar.xz frr-52a51fd333258529aa98a0d35e7bf757cc645f2b.zip | |
bgpd: resolve merge issues in bgp_attr_check()
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_attr.h')
| -rw-r--r-- | bgpd/bgp_attr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h index a9e8b4f5d..d71cb6805 100644 --- a/bgpd/bgp_attr.h +++ b/bgpd/bgp_attr.h @@ -171,7 +171,7 @@ extern void bgp_attr_init (void); extern void bgp_attr_finish (void); extern bgp_attr_parse_ret_t bgp_attr_parse (struct peer *, struct attr *, bgp_size_t, struct bgp_nlri *, - struct bgp_nlri *, bgp_size_t); + struct bgp_nlri *); extern struct attr_extra *bgp_attr_extra_get (struct attr *); extern void bgp_attr_extra_free (struct attr *); extern void bgp_attr_dup (struct attr *, struct attr *); |