Revert "zebra: Add connected with noprefixroute"

This reverts commit b311787366bae730b58d416251eed45c608df8a3.

3 files changed, 12 insertions, 29 deletions

diff --git a/lib/if.h b/lib/if.h
index 66d1f30d93..7b4415da45 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -420,8 +420,6 @@ struct connected {
 #define ZEBRA_IFA_SECONDARY    (1 << 0)
 #define ZEBRA_IFA_PEER         (1 << 1)
 #define ZEBRA_IFA_UNNUMBERED   (1 << 2)
-#define ZEBRA_IFA_NOPREFIXROUTE (1 << 3)
-
 	/* N.B. the ZEBRA_IFA_PEER flag should be set if and only if
 	   a peer address has been configured.  If this flag is set,
 	   the destination field must contain the peer address.
diff --git a/zebra/connected.c b/zebra/connected.c
index 2977aebfbc..ee0823f56f 100644
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -276,15 +276,13 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 			return;
 	}
 
-	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
-		rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
-			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
-			zvrf->table_id, metric, 0, 0, 0, false);
-
-		rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
-			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
-			zvrf->table_id, metric, 0, 0, 0, false);
-	}
+	rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
+		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
+		false);
+
+	rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
+		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
+		false);
 
 	/* Schedule LSP forwarding entries for processing, if appropriate. */
 	if (zvrf->vrf->vrf_id == VRF_DEFAULT) {
@@ -459,15 +457,11 @@ void connected_down(struct interface *ifp, struct connected *ifc)
 	 * Same logic as for connected_up(): push the changes into the
 	 * head.
 	 */
-	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
-		rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
-			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
-			   zvrf->table_id, 0, 0, false);
-
-		rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
-			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
-			   zvrf->table_id, 0, 0, false);
-	}
+	rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
+		   0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
+
+	rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT,
+		   0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
 
 	/* Schedule LSP forwarding entries for processing, if appropriate. */
 	if (zvrf->vrf->vrf_id == VRF_DEFAULT) {
diff --git a/zebra/interface.c b/zebra/interface.c
index 9864b825ee..1afd9d5a7d 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1331,9 +1331,6 @@ static void zebra_if_addr_update_ctx(struct zebra_dplane_ctx *ctx,
 	if (dplane_ctx_intf_is_secondary(ctx))
 		SET_FLAG(flags, ZEBRA_IFA_SECONDARY);
 
-	if (dplane_ctx_intf_is_noprefixroute(ctx))
-		SET_FLAG(flags, ZEBRA_IFA_NOPREFIXROUTE);
-
 	/* Label? */
 	if (dplane_ctx_intf_has_label(ctx))
 		label = dplane_ctx_get_intf_label(ctx);
@@ -2411,12 +2408,6 @@ static void connected_dump_vty(struct vty *vty, json_object *json,
 		vty_out(vty, " secondary");
 
 	if (json)
-		json_object_boolean_add(json_addr, "noPrefixRoute",
-					CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE));
-	else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE))
-		vty_out(vty, " noprefixroute");
-
-	if (json)
 		json_object_boolean_add(
 			json_addr, "unnumbered",
 			CHECK_FLAG(connected->flags, ZEBRA_IFA_UNNUMBERED));