From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 5 Sep 2017 11:48:52 +0000 (-0400)
Subject: eigrp: Fix missing neighbor->nexthop changes?
X-Git-Tag: frr-4.0-dev~340^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=af0a63440534e6d1e093a6f14b5e63c05649038f;p=mirror%2Ffrr.git

eigrp: Fix missing neighbor->nexthop changes?

I'm not sure how this was missed or why master
is not failing to compile.

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

diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c
index 0167c8b3c2..03c3705ffd 100644
--- a/eigrpd/eigrp_query.c
+++ b/eigrpd/eigrp_query.c
@@ -126,7 +126,7 @@ void eigrp_query_receive(struct eigrp *eigrp, struct ip *iph,
 			 * know)*/
 			if (dest != NULL) {
 				struct eigrp_fsm_action_message msg;
-				struct eigrp_neighbor_entry *entry =
+				struct eigrp_nexthop_entry *entry =
 					eigrp_prefix_entry_lookup(dest->entries,
 								  nbr);
 				msg.packet_type = EIGRP_OPC_QUERY;
diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index 11e6e855c3..20d8b1b47c 100644
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -168,7 +168,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
 			assert(dest);
 
 			struct eigrp_fsm_action_message msg;
-			struct eigrp_neighbor_entry *entry =
+			struct eigrp_nexthop_entry *entry =
 				eigrp_prefix_entry_lookup(dest->entries, nbr);
 
 			if (eigrp_update_prefix_apply(eigrp, ei,
diff --git a/eigrpd/eigrp_routemap.c b/eigrpd/eigrp_routemap.c
index 360e28adf7..9f80c6c017 100644
--- a/eigrpd/eigrp_routemap.c
+++ b/eigrpd/eigrp_routemap.c
@@ -258,7 +258,7 @@ static route_map_result_t route_match_metric(void *rule, struct prefix *prefix,
 	//  u_int32_t *metric;
 	//  u_int32_t  check;
 	//  struct rip_info *rinfo;
-	//  struct eigrp_neighbor_entry *te;
+	//  struct eigrp_nexthop_entry *te;
 	//  struct eigrp_prefix_entry *pe;
 	//  struct listnode *node, *node2, *nnode, *nnode2;
 	//  struct eigrp *e;