[bgpd] Remove dead code in ORIGINATOR_ID packet forming code
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
CID #1
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index e9dde0f..4c72d80 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1505,13 +1505,8 @@
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);