From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Feb 2016 20:05:46 +0000 (-0500)
Subject: bgpd: Fix function indirection when none is needed
X-Git-Tag: frr-2.0-rc1~1102
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a7ee645d23fe14b4cc3a7675965418fb56b430a3;p=matthieu%2Ffrr.git

bgpd: Fix function indirection when none is needed

bgp_update_main was only called by bgp_update.
bgp_update only called bgp_update_main.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reivewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index ef2f07caf2..737e8e1110 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2154,11 +2154,11 @@ bgp_update_martian_nexthop (struct bgp *bgp, afi_t afi, safi_t safi, struct attr
   return ret;
 }
 
-static int
-bgp_update_main (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
-                 struct attr *attr, afi_t afi, safi_t safi, int type,
-                 int sub_type, struct prefix_rd *prd, u_char *tag,
-                 int soft_reconfig)
+int
+bgp_update (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
+            struct attr *attr, afi_t afi, safi_t safi, int type,
+            int sub_type, struct prefix_rd *prd, u_char *tag,
+            int soft_reconfig)
 {
   int ret;
   int aspath_loop_count = 0;
@@ -2516,15 +2516,6 @@ bgp_update_main (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
   return 0;
 }
 
-int
-bgp_update (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
-            struct attr *attr, afi_t afi, safi_t safi, int type, int sub_type,
-            struct prefix_rd *prd, u_char *tag, int soft_reconfig)
-{
-  return bgp_update_main (peer, p, addpath_id, attr, afi, safi, type, sub_type,
-                          prd, tag, soft_reconfig);
-}
-
 int
 bgp_withdraw (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
               struct attr *attr, afi_t afi, safi_t safi, int type, int sub_type,