Revert "zebra: Add ability to note that a address is NOPREFIXROUTE"

This reverts commit ebf9a394e30bf35c48612831ecebdb533232d729.

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 22a78cb0f336fe531dc7ebda437d7890643bc6e5..fcb692b715fe589c74324c8cb528af8d2f92f6aa 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -1930,9 +1930,6 @@ int netlink_interface_addr_dplane(struct nlmsghdr *h, ns_id_t ns_id,
        if (kernel_flags & IFA_F_SECONDARY)
                dplane_ctx_intf_set_secondary(ctx);
 
-       if (kernel_flags & IFA_F_NOPREFIXROUTE)
-               dplane_ctx_intf_set_noprefixroute(ctx);
-
        /* Label */
        if (tb[IFA_LABEL]) {
                label = (char *)RTA_DATA(tb[IFA_LABEL]);

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 34ff53dcfd09bbedcd795fef080191a901faef28..31ce4d8265a7043365dbad63c914f05b95cc0861 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -191,7 +191,6 @@ struct dplane_intf_info {
 #define DPLANE_INTF_BROADCAST   (1 << 2)
 #define DPLANE_INTF_HAS_DEST    DPLANE_INTF_CONNECTED
 #define DPLANE_INTF_HAS_LABEL   (1 << 4)
-#define DPLANE_INTF_NOPREFIXROUTE (1 << 5)
 
        /* Interface address/prefix */
        struct prefix prefix;
@@ -2069,13 +2068,6 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx)
        return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED);
 }
 
-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx)
-{
-       DPLANE_CTX_VALID(ctx);
-
-       return (ctx->u.intf.flags & DPLANE_INTF_NOPREFIXROUTE);
-}
-
 bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx)
 {
        DPLANE_CTX_VALID(ctx);
@@ -2104,13 +2096,6 @@ void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx)
        ctx->u.intf.flags |= DPLANE_INTF_SECONDARY;
 }
 
-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx)
-{
-       DPLANE_CTX_VALID(ctx);
-
-       ctx->u.intf.flags |= DPLANE_INTF_NOPREFIXROUTE;
-}
-
 void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx)
 {
        DPLANE_CTX_VALID(ctx);

diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h
index c61fae51434b3c5930560f86f11c4b5eb2fa74f0..6716c0ffb6c9720d902ec2280748d7241decf90f 100644 (file)
--- a/zebra/zebra_dplane.h
+++ b/zebra/zebra_dplane.h
@@ -533,8 +533,6 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx);
 void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx);
 bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx);
 void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx);
-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx);
-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx);
 bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx);
 void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx);
 const struct prefix *dplane_ctx_get_intf_addr(