Revert "Use metric for default-originate with route-map if applied"

diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index 594eec59eb75261b2ebbb2b7dbca1836332eb965..d555006571cb5d35077644c5f4a1a52a1466104e 100644 (file)
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -690,7 +690,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
        aspath = attr.aspath;
 
        attr.local_pref = bgp->default_local_pref;
-       attr.flag |= ATTR_FLAG_BIT(BGP_ATTR_MULTI_EXIT_DISC);
 
        memset(&p, 0, sizeof(p));
        p.family = afi2family(afi);
@@ -725,8 +724,6 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
                                        peer->default_rmap[afi][safi].map,
                                        &rn->p, RMAP_BGP, &info);
 
-                               attr.med = info.attr->med;
-
                                /* The route map might have set attributes. If
                                 * we don't flush them
                                 * here, they will be leaked. */