Merge pull request #15314 from opensourcerouting/fix/remove_bgp_evpn_…

…attr_get_df_pref bgpd: A couple random EVPN findings
FRRouting · Feb 7, 2024 · 7fe05d6 · 7fe05d6
2 parents 1bc2fa3 + 82d4363
commit 7fe05d6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/bgpd/bgp_evpn_mh.h b/bgpd/bgp_evpn_mh.h
@@ -388,11 +388,6 @@ static inline bool bgp_evpn_attr_is_local_es(struct attr *attr)
 	return attr ? !!(attr->es_flags & ATTR_ES_IS_LOCAL) : false;
 }
 
-static inline uint32_t bgp_evpn_attr_get_df_pref(struct attr *attr)
-{
-	return (attr) ? attr->df_pref : 0;
-}
-
 static inline bool bgp_evpn_local_es_is_active(struct bgp_evpn_es *es)
 {
 	return (es->flags & BGP_EVPNES_OPER_UP)

diff --git a/zebra/zebra_evpn_mh.h b/zebra/zebra_evpn_mh.h
@@ -154,7 +154,7 @@ struct zebra_evpn_es_vtep {
 
 	/* Parameters for DF election */
 	uint8_t df_alg;
-	uint32_t df_pref;
+	uint16_t df_pref;
 
 	/* XXX - maintain a backpointer to struct zebra_vtep */
 };