net/sfc: fix jumbo frame flag condition for MTU set

[dpdk.git] / lib / librte_ring / rte_ring.c

diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c
index ebe5ccf..f17bd96 100644 (file)
--- a/lib/librte_ring/rte_ring.c
+++ b/lib/librte_ring/rte_ring.c
@@ -42,6 +42,11 @@ static struct rte_tailq_elem rte_ring_tailq = {
 };
 EAL_REGISTER_TAILQ(rte_ring_tailq)
 
+/* mask of all valid flag values to ring_create() */
+#define RING_F_MASK (RING_F_SP_ENQ | RING_F_SC_DEQ | RING_F_EXACT_SZ | \
+                    RING_F_MP_RTS_ENQ | RING_F_MC_RTS_DEQ |           \
+                    RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ)
+
 /* true if x is a power of 2 */
 #define POWEROF2(x) ((((x)-1) & (x)) == 0)
 
@@ -174,8 +179,8 @@ get_sync_type(uint32_t flags, enum rte_ring_sync_type *prod_st,
 }
 
 int
-rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
-       unsigned flags)
+rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
+       unsigned int flags)
 {
        int ret;
 
@@ -197,6 +202,13 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
        RTE_BUILD_BUG_ON(offsetof(struct rte_ring_headtail, tail) !=
                offsetof(struct rte_ring_rts_headtail, tail.val.pos));
 
+       /* future proof flags, only allow supported values */
+       if (flags & ~RING_F_MASK) {
+               RTE_LOG(ERR, RING,
+                       "Unsupported flags requested %#x\n", flags);
+               return -EINVAL;
+       }
+
        /* init the ring structure */
        memset(r, 0, sizeof(*r));
        ret = strlcpy(r->name, name, sizeof(r->name));