From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 12 May 2017 14:04:31 +0000 (-0300)
Subject: lib: remove gap between AFI_IP6 and AFI_L2VPN
X-Git-Tag: reindent-master-before~169^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=17c7bb7b1c4dabd41515b1423f6848614affc255;p=matthieu%2Ffrr.git

lib: remove gap between AFI_IP6 and AFI_L2VPN

We have several pieces of code like this in FRR:

  for (afi = AFI_IP; afi < AFI_MAX; afi++)
    for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
      bgp_distance_table[afi][safi] = bgp_table_init (afi, safi);

We were creating a lot of useless garbage in the code because of this
gap. Fix this.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/lib/zebra.h b/lib/zebra.h
index cd72dc67f8..0cc81bdb70 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -404,8 +404,8 @@ extern const char *zserv_command_string (unsigned int command);
 typedef enum {
   AFI_IP  = 1,
   AFI_IP6 = 2,
-  AFI_L2VPN = 4,
-  AFI_MAX = 5
+  AFI_L2VPN = 3,
+  AFI_MAX = 4
 } afi_t;
 
 /* Subsequent Address Family Identifier. */