bgpd: peer->bgp must be non NULL

We lock and set peer->bgp at peer creation and only
remove it at deletion.  Therefore these tests are
not needed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index ce46b21f03d1be51d1de1224ff43c6184c4bae56..91b6929ff9998e74cdb0077e433295c607d11c23 100644 (file)
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -101,7 +101,7 @@ static void bgp_bfd_peer_sendmsg(struct peer *peer, int command)
 
        bfd_info = (struct bfd_info *)peer->bfd_info;
 
-       if (peer->bgp && (peer->bgp->inst_type == BGP_INSTANCE_TYPE_VRF))
+       if (peer->bgp->inst_type == BGP_INSTANCE_TYPE_VRF)
                vrf_id = peer->bgp->vrf_id;
 
        if (command == ZEBRA_BFD_DEST_DEREGISTER) {

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 3255aff2a8e080a41404139d5d9b66f2bc4bb995..e4a0a1d404ea50345fdcb4c497f277c9c90b6a38 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -1377,7 +1377,7 @@ int bgp_start(struct peer *peer)
                return 0;
        }
 
-       if (peer->bgp && peer->bgp->vrf_id == VRF_UNKNOWN) {
+       if (peer->bgp->vrf_id == VRF_UNKNOWN) {
                if (bgp_debug_neighbor_events(peer))
                        zlog_err(
                                "%s [FSM] In a VRF that is not initialised yet",

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index cb702d80d1f1fd7f8afe97db90ece96fb56098ce..d17c33441982be008536d1a6238cf2cd770b5695 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -389,7 +389,7 @@ int bgp_generate_updgrp_packets(struct thread *thread)
        if (peer->status != Established)
                return 0;
 
-       if (peer->bgp && peer->bgp->main_peers_update_hold)
+       if (peer->bgp->main_peers_update_hold)
                return 0;
 
        do {