bgpd: Cleanup bgp_connected_set|get function names

The bgp_connected_set_node_info and bgp_connected_get_node_info
function names were slightly backwards lets fix them up
to bgp_node_set_bgp_connected_ref_info and bgp_node_get_bgp_connected_ref_info

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

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 1877077602c2a708a46ace362c9ebe63e098cd4b..30d786fcda56530e00b58b7592d0445e84dc5d79 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -349,14 +349,14 @@ void bgp_connected_add(struct bgp *bgp, struct connected *ifc)
 
                rn = bgp_node_get(bgp->connected_table[AFI_IP],
                                  (struct prefix *)&p);
-               bc = bgp_connected_get_node_info(rn);
+               bc = bgp_node_get_bgp_connected_ref_info(rn);
                if (bc)
                        bc->refcnt++;
                else {
                        bc = XCALLOC(MTYPE_BGP_CONN,
                                     sizeof(struct bgp_connected_ref));
                        bc->refcnt = 1;
-                       bgp_connected_set_node_info(rn, bc);
+                       bgp_node_set_bgp_connected_ref_info(rn, bc);
                }
 
                for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
@@ -382,14 +382,14 @@ void bgp_connected_add(struct bgp *bgp, struct connected *ifc)
                rn = bgp_node_get(bgp->connected_table[AFI_IP6],
                                  (struct prefix *)&p);
 
-               bc = bgp_connected_get_node_info(rn);
+               bc = bgp_node_get_bgp_connected_ref_info(rn);
                if (bc)
                        bc->refcnt++;
                else {
                        bc = XCALLOC(MTYPE_BGP_CONN,
                                     sizeof(struct bgp_connected_ref));
                        bc->refcnt = 1;
-                       bgp_connected_set_node_info(rn, bc);
+                       bgp_node_set_bgp_connected_ref_info(rn, bc);
                }
        }
 }
@@ -426,11 +426,11 @@ void bgp_connected_delete(struct bgp *bgp, struct connected *ifc)
        if (!rn)
                return;
 
-       bc = bgp_connected_get_node_info(rn);
+       bc = bgp_node_get_bgp_connected_ref_info(rn);
        bc->refcnt--;
        if (bc->refcnt == 0) {
                XFREE(MTYPE_BGP_CONN, bc);
-               bgp_connected_set_node_info(rn, NULL);
+               bgp_node_set_bgp_connected_ref_info(rn, NULL);
        }
        bgp_unlock_node(rn);
        bgp_unlock_node(rn);
@@ -442,14 +442,14 @@ static void bgp_connected_cleanup(struct route_table *table,
        struct bgp_connected_ref *bc;
        struct bgp_node *bn = bgp_node_from_rnode(rn);
 
-       bc = bgp_connected_get_node_info(bn);
+       bc = bgp_node_get_bgp_connected_ref_info(bn);
        if (!bc)
                return;
 
        bc->refcnt--;
        if (bc->refcnt == 0) {
                XFREE(MTYPE_BGP_CONN, bc);
-               bgp_connected_set_node_info(bn, NULL);
+               bgp_node_set_bgp_connected_ref_info(bn, NULL);
        }
 }
 

diff --git a/bgpd/bgp_table.h b/bgpd/bgp_table.h
index 936d72ff19c2b94180aeb7ed42a7535617ed05fd..a76af0ef28e623d59fe856d1a47afaa5cd3b236b 100644 (file)
--- a/bgpd/bgp_table.h
+++ b/bgpd/bgp_table.h
@@ -356,13 +356,14 @@ static inline void bgp_node_set_bgp_static_info(struct bgp_node *node,
 }
 
 static inline struct bgp_connected_ref *
-bgp_connected_get_node_info(struct bgp_node *node)
+bgp_node_get_bgp_connected_ref_info(struct bgp_node *node)
 {
        return node->info;
 }
 
-static inline void bgp_connected_set_node_info(struct bgp_node *node,
-                                              struct bgp_connected_ref *bc)
+static inline void
+bgp_node_set_bgp_connected_ref_info(struct bgp_node *node,
+                                   struct bgp_connected_ref *bc)
 {
        node->info = bc;
 }