Merge branch 'pr/2986'

Conflicts:
	bgpd/bgp_network.c (BGP_ERR_* -> EC_BGP_*)

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_network.c
index 458edab50d30be2c1d797298e48d8331ef05c5d0,f6cad646174a45dafc81d415b780068abff16983..d56fdd75cee62dcfed059eb89995c5cdd5d63cbf
--- 1/bgpd/bgp_network.c
--- 2/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@@ -618,15 -619,12 +620,12 @@@ int bgp_getsockname(struct peer *peer
        if (!peer->su_remote)
                return -1;
  
-       if (bgp_nexthop_set(peer->su_local, peer->su_remote, &peer->nexthop,
-                           peer)) {
- #if defined(HAVE_CUMULUS)
-               flog_err(
-                       EC_BGP_NH_UPD,
-                       "%s: nexthop_set failed, resetting connection - intf %p",
-                       peer->host, peer->nexthop.ifp);
+       if (!bgp_zebra_nexthop_set(peer->su_local, peer->su_remote,
+                                  &peer->nexthop, peer)) {
 -              flog_err(BGP_ERR_NH_UPD,
++              flog_err(EC_BGP_NH_UPD,
+                        "%s: nexthop_set failed, resetting connection - intf %p",
+                        peer->host, peer->nexthop.ifp);
                return -1;
- #endif
        }
        return 0;
  }

diff --cc bgpd/bgp_zebra.c
Simple merge