diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-08-19 18:18:35 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-08-19 18:18:35 +0200 |
| commit | 810a8dfc93f4cb64323c89872dbb8f4323e5aa57 (patch) | |
| tree | a0a069a303325b0d55a6c2c1aad33efe01ae78e5 /bgpd/bgp_nexthop.c | |
| parent | zebra: Fix up cherry-pick mistake (diff) | |
| parent | bgpd: Upon interface up (update) only kick-off non-Established peers (diff) | |
| download | frr-810a8dfc93f4cb64323c89872dbb8f4323e5aa57.tar.xz frr-810a8dfc93f4cb64323c89872dbb8f4323e5aa57.zip | |
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
Diffstat (limited to 'bgpd/bgp_nexthop.c')
| -rw-r--r-- | bgpd/bgp_nexthop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index d96224c09..c38d54ef7 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -237,6 +237,7 @@ bgp_connected_add (struct bgp *bgp, struct connected *ifc) for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) { if (peer->conf_if && (strcmp (peer->conf_if, ifc->ifp->name) == 0) && + peer->status != Established && !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) { if (peer_active(peer)) |