net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_sched / rte_red.h

diff --git a/lib/librte_sched/rte_red.h b/lib/librte_sched/rte_red.h
index 78af4e7..6edf914 100644 (file)
--- a/lib/librte_sched/rte_red.h
+++ b/lib/librte_sched/rte_red.h
@@ -63,19 +63,6 @@ extern "C" {
 #define RTE_RED_INT16_NBITS                 (sizeof(uint16_t) * CHAR_BIT)
 #define RTE_RED_WQ_LOG2_NUM                 (RTE_RED_WQ_LOG2_MAX - RTE_RED_WQ_LOG2_MIN + 1)
 
-#ifdef RTE_RED_DEBUG
-
-#define RTE_RED_ASSERT(exp)                                      \
-if (!(exp)) {                                                    \
-       rte_panic("line%d\tassert \"" #exp "\" failed\n", __LINE__); \
-}
-
-#else
-
-#define RTE_RED_ASSERT(exp)                 do { } while(0)
-
-#endif /* RTE_RED_DEBUG */
-
 /**
  * Externs
  *
@@ -152,7 +139,7 @@ rte_red_config_init(struct rte_red_config *red_cfg,
 /**
  * @brief Generate random number for RED
  *
- * Implemenetation based on:
+ * Implementation based on:
  * http://software.intel.com/en-us/articles/fast-random-number-generator-on-the-intel-pentiumr-4-processor/
  *
  * 10 bit shift has been found through empirical tests (was 16).
@@ -163,7 +150,7 @@ static inline uint32_t
 rte_fast_rand(void)
 {
        rte_red_rand_seed = (214013 * rte_red_rand_seed) + 2531011;
-       return (rte_red_rand_seed >> 10);
+       return rte_red_rand_seed >> 10;
 }
 
 /**
@@ -213,7 +200,7 @@ __rte_red_calc_qempty_factor(uint8_t wq_log2, uint16_t m)
         * Now using basic math we compute 2^n:
         *   2^(f+n) = 2^f * 2^n
         *   2^f - we use lookup table
-        *   2^n - can be replaced with bit shift right oeprations
+        *   2^n - can be replaced with bit shift right operations
         */
 
        f = (n >> 6) & 0xf;
@@ -246,8 +233,8 @@ rte_red_enqueue_empty(const struct rte_red_config *red_cfg,
 {
        uint64_t time_diff = 0, m = 0;
 
-       RTE_RED_ASSERT(red_cfg != NULL);
-       RTE_RED_ASSERT(red != NULL);
+       RTE_ASSERT(red_cfg != NULL);
+       RTE_ASSERT(red != NULL);
 
        red->count ++;
 
@@ -361,8 +348,8 @@ rte_red_enqueue_nonempty(const struct rte_red_config *red_cfg,
        struct rte_red *red,
        const unsigned q)
 {
-       RTE_RED_ASSERT(red_cfg != NULL);
-       RTE_RED_ASSERT(red != NULL);
+       RTE_ASSERT(red_cfg != NULL);
+       RTE_ASSERT(red != NULL);
 
        /**
        * EWMA filter (Sally Floyd and Van Jacobson):
@@ -424,8 +411,8 @@ rte_red_enqueue(const struct rte_red_config *red_cfg,
        const unsigned q,
        const uint64_t time)
 {
-       RTE_RED_ASSERT(red_cfg != NULL);
-       RTE_RED_ASSERT(red != NULL);
+       RTE_ASSERT(red_cfg != NULL);
+       RTE_ASSERT(red != NULL);
 
        if (q != 0) {
                return rte_red_enqueue_nonempty(red_cfg, red, q);