X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_sched%2Frte_red.c;h=45a452f68e87fcbdb494fed9871762fa393a5363;hb=4bf2b36fd14da74f5dd5c111501698a5b7cb0f6d;hp=832d697ce3ca157087f80144215e2b96fac95c66;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git

diff --git a/lib/librte_sched/rte_red.c b/lib/librte_sched/rte_red.c
index 832d697ce3..45a452f68e 100644
--- a/lib/librte_sched/rte_red.c
+++ b/lib/librte_sched/rte_red.c
@@ -1,46 +1,16 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <math.h>
 #include "rte_red.h"
 #include <rte_random.h>
+#include <rte_common.h>
 
 #ifdef __INTEL_COMPILER
 #pragma warning(disable:2259) /* conversion may lose significant bits */
 #endif
 
-#define DIM(x) (sizeof(x)/sizeof(x[0]))
-
 static int rte_red_init_done = 0;     /**< Flag to indicate that global initialisation is done */
 uint32_t rte_red_rand_val = 0;        /**< Random value cache */
 uint32_t rte_red_rand_seed = 0;       /**< Seed for random number generation */
@@ -68,23 +38,23 @@ __rte_red_init_tables(void)
 	double table_size = 0.0;
 
 	scale = (double)(1 << RTE_RED_SCALING);
-	table_size = (double)(DIM(rte_red_pow2_frac_inv));
+	table_size = (double)(RTE_DIM(rte_red_pow2_frac_inv));
 
-	for (i = 0; i < DIM(rte_red_pow2_frac_inv); i++) {
+	for (i = 0; i < RTE_DIM(rte_red_pow2_frac_inv); i++) {
 		double m = (double)i;
-		
+
 		rte_red_pow2_frac_inv[i] = (uint16_t) round(scale / pow(2, m / table_size));
 	}
-	
+
 	scale = 1024.0;
 
-	RTE_RED_ASSERT(RTE_RED_WQ_LOG2_NUM == DIM(rte_red_log2_1_minus_Wq));
+	RTE_ASSERT(RTE_RED_WQ_LOG2_NUM == RTE_DIM(rte_red_log2_1_minus_Wq));
 
 	for (i = RTE_RED_WQ_LOG2_MIN; i <= RTE_RED_WQ_LOG2_MAX; i++) {
 		double n = (double)i;
 		double Wq = pow(2, -n);
 		uint32_t index = i - RTE_RED_WQ_LOG2_MIN;
-		
+
 		rte_red_log2_1_minus_Wq[index] = (uint16_t) round(-1.0 * scale * log2(1.0 - Wq));
 		/**
 		* Table entry of zero, corresponds to a Wq of zero
@@ -138,7 +108,7 @@ rte_red_config_init(struct rte_red_config *red_cfg,
 	if (maxp_inv > RTE_RED_MAXP_INV_MAX) {
 		return -7;
 	}
-	
+
 	/**
 	 *  Initialize the RED module if not already done
 	 */