summaryrefslogtreecommitdiffstats
path: root/bgpd/bgp_attr.c
diff options
context:
space:
mode:
Diffstat (limited to 'bgpd/bgp_attr.c')
-rw-r--r--bgpd/bgp_attr.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index e9dde0fd..4c72d80a 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1505,13 +1505,8 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID))
stream_put_in_addr (s, &attr->originator_id);
- else
- {
- if (from)
- stream_put_in_addr (s, &from->remote_id);
- else
- stream_put_in_addr (s, &attr->originator_id);
- }
+ else
+ stream_put_in_addr (s, &from->remote_id);
/* Cluster list. */
stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);