Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / bgpd / bgp_mpath.c

diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c
index 84c847d79647001578de896f3e171dfa28c68f38..e920d5753ead60b9fc3b7943f5098f481c78901c 100644 (file)
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * BGP Multipath
  * Copyright (C) 2010 Google Inc.
  *
  * This file is part of Quagga
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -142,21 +129,15 @@ int bgp_path_info_nexthop_cmp(struct bgp_path_info *bpi1,
                                        &bpi2->attr->mp_nexthop_global);
                                break;
                        case BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL:
-                               addr1 = (CHECK_FLAG(
-                                               bpi1->attr->nh_flag,
-                                               BGP_ATTR_NH_MP_PREFER_GLOBAL))
+                               addr1 = (bpi1->attr->mp_nexthop_prefer_global)
                                                ? bpi1->attr->mp_nexthop_global
                                                : bpi1->attr->mp_nexthop_local;
-                               addr2 = (CHECK_FLAG(
-                                               bpi2->attr->nh_flag,
-                                               BGP_ATTR_NH_MP_PREFER_GLOBAL))
+                               addr2 = (bpi2->attr->mp_nexthop_prefer_global)
                                                ? bpi2->attr->mp_nexthop_global
                                                : bpi2->attr->mp_nexthop_local;
 
-                               if (!CHECK_FLAG(bpi1->attr->nh_flag,
-                                               BGP_ATTR_NH_MP_PREFER_GLOBAL) &&
-                                   !CHECK_FLAG(bpi2->attr->nh_flag,
-                                               BGP_ATTR_NH_MP_PREFER_GLOBAL))
+                               if (!bpi1->attr->mp_nexthop_prefer_global
+                                   && !bpi2->attr->mp_nexthop_prefer_global)
                                        compare = !bgp_interface_same(
                                                bpi1->peer->ifp,
                                                bpi2->peer->ifp);