Revert "bgpd: Move attr->pmsi_tnl_type to attr->extra->pmsi_tnl_type"

This reverts commit fc6ba64f04696416a1216bb57a7fd72efc5a0904.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index b38cbf8ef8eff136ae3ec99a59cd7543a9d4edac..f88af4f4324e57b578c9b635388ac52a7e6b6746 100644 (file)
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -160,9 +160,6 @@ struct bgp_attr_srv6_l3vpn {
 };
 
 struct attr_extra {
-       /* PMSI tunnel type (RFC 6514). */
-       enum pta_type pmsi_tnl_type;
-
        /* Extended Communities attribute. */
        struct ecommunity *ipv6_ecommunity;
 };
@@ -190,6 +187,9 @@ struct attr {
        /* Path origin attribute */
        uint8_t origin;
 
+       /* PMSI tunnel type (RFC 6514). */
+       enum pta_type pmsi_tnl_type;
+
        /* has the route-map changed any attribute?
           Used on the peer outbound side. */
        uint32_t rmap_change_flags;
@@ -502,21 +502,15 @@ static inline uint32_t mac_mobility_seqnum(struct attr *attr)
        return (attr) ? attr->mm_seqnum : 0;
 }
 
-static inline enum pta_type bgp_attr_get_pmsi_tnl_type(const struct attr *attr)
+static inline enum pta_type bgp_attr_get_pmsi_tnl_type(struct attr *attr)
 {
-       if (attr->extra)
-               return attr->extra->pmsi_tnl_type;
-
-       return PMSI_TNLTYPE_NO_INFO;
+       return attr->pmsi_tnl_type;
 }
 
 static inline void bgp_attr_set_pmsi_tnl_type(struct attr *attr,
                                              enum pta_type pmsi_tnl_type)
 {
-       if (!attr->extra)
-               attr->extra = bgp_attr_extra_alloc();
-
-       attr->extra->pmsi_tnl_type = pmsi_tnl_type;
+       attr->pmsi_tnl_type = pmsi_tnl_type;
 }
 
 static inline struct ecommunity *