FIB type RTE_FIB_TYPE_MAX is used only for sanity checks,
remove it to prevent applications start using it.
The same is for FIB6's RTE_FIB6_TYPE_MAX.
Signed-off-by: Vladimir Medvedkin <vladimir.medved...@intel.com>
---
app/test/test_fib.c | 2 +-
app/test/test_fib6.c | 2 +-
lib/librte_fib/rte_fib.c | 2 +-
lib/librte_fib/rte_fib.h | 3 +--
lib/librte_fib/rte_fib6.c | 2 +-
lib/librte_fib/rte_fib6.h | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app/test/test_fib.c b/app/test/test_fib.c
index ca80a5d..e46b993 100644
--- a/app/test/test_fib.c
+++ b/app/test/test_fib.c
@@ -61,7 +61,7 @@ test_create_invalid(void)
"Call succeeded with invalid parameters\n");
config.max_routes = MAX_ROUTES;
- config.type = RTE_FIB_TYPE_MAX;
+ config.type = RTE_FIB_DIR24_8 + 1;
fib = rte_fib_create(__func__, SOCKET_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index af589fe..74abfc7 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -63,7 +63,7 @@ test_create_invalid(void)
"Call succeeded with invalid parameters\n");
config.max_routes = MAX_ROUTES;
- config.type = RTE_FIB6_TYPE_MAX;
+ config.type = RTE_FIB6_TRIE + 1;
fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
RTE_TEST_ASSERT(fib == NULL,
"Call succeeded with invalid parameters\n");
diff --git a/lib/librte_fib/rte_fib.c b/lib/librte_fib/rte_fib.c
index 1af2a5f..4d2af84 100644
--- a/lib/librte_fib/rte_fib.c
+++ b/lib/librte_fib/rte_fib.c
@@ -159,7 +159,7 @@ rte_fib_create(const char *name, int socket_id, struct
rte_fib_conf *conf)
/* Check user arguments. */
if ((name == NULL) || (conf == NULL) || (conf->max_routes < 0) ||
- (conf->type >= RTE_FIB_TYPE_MAX)) {
+ (conf->type > RTE_FIB_DIR24_8)) {
rte_errno = EINVAL;
return NULL;
}
diff --git a/lib/librte_fib/rte_fib.h b/lib/librte_fib/rte_fib.h
index d4e5d91..8b78113 100644
--- a/lib/librte_fib/rte_fib.h
+++ b/lib/librte_fib/rte_fib.h
@@ -34,8 +34,7 @@ struct rte_rib;
/** Type of FIB struct */
enum rte_fib_type {
RTE_FIB_DUMMY, /**< RIB tree based FIB */
- RTE_FIB_DIR24_8, /**< DIR24_8 based FIB */
- RTE_FIB_TYPE_MAX
+ RTE_FIB_DIR24_8 /**< DIR24_8 based FIB */
};
/** Modify FIB function */
diff --git a/lib/librte_fib/rte_fib6.c b/lib/librte_fib/rte_fib6.c
index 8512584..0a679a3 100644
--- a/lib/librte_fib/rte_fib6.c
+++ b/lib/librte_fib/rte_fib6.c
@@ -160,7 +160,7 @@ rte_fib6_create(const char *name, int socket_id, struct
rte_fib6_conf *conf)
/* Check user arguments. */
if ((name == NULL) || (conf == NULL) || (conf->max_routes < 0) ||
- (conf->type >= RTE_FIB6_TYPE_MAX)) {
+ (conf->type > RTE_FIB6_TRIE)) {
rte_errno = EINVAL;
return NULL;
}
diff --git a/lib/librte_fib/rte_fib6.h b/lib/librte_fib/rte_fib6.h
index 2b2a1c8..4d43a84 100644
--- a/lib/librte_fib/rte_fib6.h
+++ b/lib/librte_fib/rte_fib6.h
@@ -35,8 +35,7 @@ struct rte_rib6;
/** Type of FIB struct */
enum rte_fib6_type {
RTE_FIB6_DUMMY, /**< RIB6 tree based FIB */
- RTE_FIB6_TRIE, /**< TRIE based fib */
- RTE_FIB6_TYPE_MAX
+ RTE_FIB6_TRIE /**< TRIE based fib */
};
/** Modify FIB function */
--
2.7.4
