From: Don Slice <dslice@cumulusnetworks.com>
Date: Wed, 18 Jul 2018 13:05:50 +0000 (+0000)
Subject: zebra: fix nexthop type check for kernel default route display
X-Git-Tag: frr-6.1-dev~154^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2668%2Fhead;p=mirror%2Ffrr.git

zebra: fix nexthop type check for kernel default route display

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
---

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 1ce8e442fa..6583e9ed3f 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1199,7 +1199,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
 			}
 
 			if ((re->vrf_id != nexthop->vrf_id)
-			     && !NEXTHOP_TYPE_BLACKHOLE) {
+			     && (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
 				struct vrf *vrf =
 					vrf_lookup_by_id(nexthop->vrf_id);
 
@@ -1417,7 +1417,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
 			}
 
 			if ((nexthop->vrf_id != re->vrf_id)
-			     && !NEXTHOP_TYPE_BLACKHOLE) {
+			     && (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
 				struct vrf *vrf =
 					vrf_lookup_by_id(nexthop->vrf_id);
 
@@ -1572,7 +1572,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
 		}
 
 		if ((nexthop->vrf_id != re->vrf_id)
-		     && !NEXTHOP_TYPE_BLACKHOLE) {
+		     && (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
 			struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
 
 			if (vrf)