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_packet.c | |
| 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 '')
| -rw-r--r-- | bgpd/bgp_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index e2b8a3346..6c1e9e2f9 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -1430,7 +1430,7 @@ bgp_update_receive (struct peer *peer, bgp_size_t size) if (attribute_len) { attr_parse_ret = bgp_attr_parse (peer, &attr, attribute_len, - &mp_update, &mp_withdraw, update.length); + &mp_update, &mp_withdraw); if (attr_parse_ret == BGP_ATTR_PARSE_ERROR) { bgp_attr_unintern_sub (&attr); |