]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #10492 from ton31337/feature/pmsi_tnl_type_attr_extra
authorDonald Sharp <donaldsharp72@gmail.com>
Tue, 8 Feb 2022 19:13:04 +0000 (14:13 -0500)
committerGitHub <noreply@github.com>
Tue, 8 Feb 2022 19:13:04 +0000 (14:13 -0500)
bgpd: Move attr->pmsi_tnl_type to attr->extra->pmsi_tnl_type

1  2 
bgpd/bgp_attr.c
bgpd/bgp_attr.h

diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_attr.h
index 1e610da05769d9c53a2c29e23af3a19859efeef7,8324bca65a54a9f91dc293e9df42e63c8a140a4f..2cf332574b49b444d049c983d37aa976e23c9635
@@@ -511,21 -514,12 +514,24 @@@ static inline enum pta_type bgp_attr_ge
  static inline void bgp_attr_set_pmsi_tnl_type(struct attr *attr,
                                              enum pta_type pmsi_tnl_type)
  {
-       attr->pmsi_tnl_type = pmsi_tnl_type;
+       if (!attr->extra)
+               attr->extra = bgp_attr_extra_alloc();
+       attr->extra->pmsi_tnl_type = pmsi_tnl_type;
  }
  
 +static inline struct ecommunity *
 +bgp_attr_get_ecommunity(const struct attr *attr)
 +{
 +      return attr->ecommunity;
 +}
 +
 +static inline void bgp_attr_set_ecommunity(struct attr *attr,
 +                                         struct ecommunity *ecomm)
 +{
 +      attr->ecommunity = ecomm;
 +}
 +
  static inline struct ecommunity *
  bgp_attr_get_ipv6_ecommunity(const struct attr *attr)
  {