eigrpd: Remove unneeeded if state types

There are some unused/unneeded if state types in eigrp, remove them

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

diff --git a/eigrpd/eigrp_const.h b/eigrpd/eigrp_const.h
index 3a103fb9f2e5d2559ba67c4cb0b13541fac02239..d3d9bca82aed1b03467316090ffe1ff5a918d4b0 100644 (file)
--- a/eigrpd/eigrp_const.h
+++ b/eigrpd/eigrp_const.h
@@ -110,10 +110,8 @@ enum metric_change { METRIC_DECREASE, METRIC_SAME, METRIC_INCREASE };
 #define EIGRP_IFTYPE_NONE 0
 #define EIGRP_IFTYPE_POINTOPOINT 1
 #define EIGRP_IFTYPE_BROADCAST 2
-#define EIGRP_IFTYPE_NBMA 3
-#define EIGRP_IFTYPE_POINTOMULTIPOINT 4
-#define EIGRP_IFTYPE_LOOPBACK 5
-#define EIGRP_IFTYPE_MAX 6
+#define EIGRP_IFTYPE_LOOPBACK 3
+#define EIGRP_IFTYPE_MAX 4
 
 #define EIGRP_IF_ACTIVE                  0
 #define EIGRP_IF_PASSIVE                 1

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index f512833e0a3ab467cfc9792ac01de42d9235eb96..13a2c4206fbe73f8004970ecea772aed22f32fb3 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -745,12 +745,6 @@ void eigrp_hello_send(struct eigrp_interface *ei, uint8_t flags,
 {
        struct eigrp_packet *ep = NULL;
 
-       /* If this is passive interface, do not send EIGRP Hello.
-          if ((EIGRP_IF_PASSIVE_STATUS (ei) == EIGRP_IF_PASSIVE) ||
-          (ei->type != EIGRP_IFTYPE_NBMA))
-          return;
-       */
-
        if (IS_DEBUG_EIGRP_PACKET(0, SEND))
                zlog_debug("Queueing [Hello] Interface(%s)", IF_NAME(ei));