net/hns3: adjust data type of some variables

Using the 'int' type and 'uint16_t' type to compare is insecure.
Make them consistent.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c
index dcdc609654adbfc4cd61941d8d97119602c48cdd..221d4ccec3c63d13592a6e253325ec170f5ccb05 100644 (file)
--- a/drivers/net/hns3/hns3_common.c
+++ b/drivers/net/hns3/hns3_common.c
@@ -475,7 +475,7 @@ hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del)
        struct rte_ether_addr *addr;
        uint16_t mac_addrs_capa;
        int ret = 0;
-       int i;
+       uint16_t i;
 
        mac_addrs_capa =
                hns->is_vf ? HNS3_VF_UC_MACADDR_NUM : HNS3_UC_MACADDR_NUM;
@@ -645,8 +645,8 @@ int
 hns3_init_ring_with_vector(struct hns3_hw *hw)
 {
        uint16_t vec;
+       uint16_t i;
        int ret;
-       int i;
 
        /*
         * In hns3 network engine, vector 0 is always the misc interrupt of this

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 73693786d15bc00098c78ae0daee40205d0f6943..04d7f530ef113f4e86b895ca689ad0b8b4b7251a 100644 (file)
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -628,7 +628,7 @@ hns3_set_rss_size(struct hns3_hw *hw, uint16_t nb_rx_q)
        struct hns3_rss_conf *rss_cfg = &hw->rss_info;
        uint16_t rx_qnum_per_tc;
        uint16_t used_rx_queues;
-       int i;
+       uint16_t i;
 
        rx_qnum_per_tc = nb_rx_q / hw->num_tc;
        if (rx_qnum_per_tc > hw->rss_size_max) {

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 0b565a561479cc594fbfff691c61a5ecc24183a4..3cffacdd6a0fae79d8dbfc99d18188963daf9d14 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2928,8 +2928,8 @@ hns3_map_tqps_to_func(struct hns3_hw *hw, uint16_t func_id, uint16_t tqp_pid,
 static int
 hns3_map_tqp(struct hns3_hw *hw)
 {
+       uint16_t i;
        int ret;
-       int i;
 
        /*
         * In current version, VF is not supported when PF is driven by DPDK

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 86a4cf74d57a0e430c8e401e51db73f035efeb2f..6778e4cfc228e2c958acc48958d848ab8a6540dc 100644 (file)
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -294,8 +294,8 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
        struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
        uint32_t *origin_data_ptr = data;
        uint32_t reg_offset;
+       uint16_t i, j;
        int reg_num;
-       int i, j;
 
        /* fetching per-PF registers values from PF PCIe register space */
        reg_num = sizeof(cmdq_reg_addrs) / sizeof(uint32_t);

diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index d376486a1d4bbc9ccf19a667cd7d8c397934f9fd..4c546c93638827bb7c7506038b72794d8cb78593 100644 (file)
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -631,7 +631,7 @@ hns3_rss_set_default_args(struct hns3_hw *hw)
 {
        struct hns3_rss_conf *rss_cfg = &hw->rss_info;
        uint16_t queue_num = hw->alloc_rss_size;
-       int i;
+       uint16_t i;
 
        /* Default hash algorithm */
        rss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_TOEPLITZ;

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 4cba4fd13e575ded545cf245e49cee429b758450..be4ab16dcc7c813611cfd0f1504a37e733447975 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -387,7 +387,7 @@ hns3_enable_all_queues(struct hns3_hw *hw, bool en)
        struct hns3_tx_queue *txq;
        uint32_t rcb_reg;
        void *tqp_base;
-       int i;
+       uint16_t i;
 
        for (i = 0; i < hw->cfg_max_queues; i++) {
                if (hns3_dev_get_support(hw, INDEP_TXRX)) {
@@ -733,8 +733,8 @@ hns3pf_reset_all_tqps(struct hns3_hw *hw)
 #define HNS3_RESET_RCB_NOT_SUPPORT     0U
 #define HNS3_RESET_ALL_TQP_SUCCESS     1U
        uint8_t reset_status;
+       uint16_t i;
        int ret;
-       int i;
 
        ret = hns3_reset_rcb_cmd(hw, &reset_status);
        if (ret)
@@ -771,7 +771,7 @@ hns3vf_reset_all_tqps(struct hns3_hw *hw)
        uint8_t reset_status;
        uint8_t msg_data[2];
        int ret;
-       int i;
+       uint16_t i;
 
        memset(msg_data, 0, sizeof(uint16_t));
        ret = hns3_send_mbx_msg(hw, HNS3_MBX_QUEUE_RESET, 0, msg_data,
@@ -803,7 +803,8 @@ int
 hns3_reset_all_tqps(struct hns3_adapter *hns)
 {
        struct hns3_hw *hw = &hns->hw;
-       int ret, i;
+       uint16_t i;
+       int ret;
 
        /* Disable all queues before reset all queues */
        for (i = 0; i < hw->cfg_max_queues; i++) {
@@ -1034,7 +1035,7 @@ hns3_dev_all_rx_queue_intr_enable(struct hns3_hw *hw, bool en)
 {
        struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
        uint16_t nb_rx_q = hw->data->nb_rx_queues;
-       int i;
+       uint16_t i;
 
        if (dev->data->dev_conf.intr_conf.rxq == 0)
                return;
@@ -1118,7 +1119,7 @@ static void
 hns3_init_txq(struct hns3_tx_queue *txq)
 {
        struct hns3_desc *desc;
-       int i;
+       uint16_t i;
 
        /* Clear tx bd */
        desc = txq->tx_ring;
@@ -1142,7 +1143,7 @@ hns3_init_tx_ring_tc(struct hns3_adapter *hns)
 
        for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
                struct hns3_tc_queue_info *tc_queue = &hw->tc_queue[i];
-               int j;
+               uint16_t j;
 
                if (!tc_queue->enable)
                        continue;
@@ -1439,7 +1440,7 @@ hns3_alloc_txq_and_dma_zone(struct rte_eth_dev *dev,
        struct hns3_tx_queue *txq;
        struct hns3_desc *desc;
        unsigned int tx_desc;
-       int i;
+       uint16_t i;
 
        txq = rte_zmalloc_socket(q_info->type, sizeof(struct hns3_tx_queue),
                                 RTE_CACHE_LINE_SIZE, q_info->socket_id);
@@ -1676,7 +1677,7 @@ hns3_dev_release_mbufs(struct hns3_adapter *hns)
        struct rte_eth_dev_data *dev_data = hns->hw.data;
        struct hns3_rx_queue *rxq;
        struct hns3_tx_queue *txq;
-       int i;
+       uint16_t i;
 
        if (dev_data->rx_queues)
                for (i = 0; i < dev_data->nb_rx_queues; i++) {
@@ -3083,7 +3084,7 @@ hns3_tx_free_useless_buffer(struct hns3_tx_queue *txq)
        uint16_t tx_next_use = txq->next_to_use;
        struct hns3_entry *tx_entry = &txq->sw_ring[tx_next_clean];
        struct hns3_desc *desc = &txq->tx_ring[tx_next_clean];
-       int i;
+       uint16_t i;
 
        if (tx_next_use >= tx_next_clean &&
            tx_next_use < tx_next_clean + txq->tx_rs_thresh)
@@ -3981,7 +3982,7 @@ hns3_tx_free_buffer_simple(struct hns3_tx_queue *txq)
        struct hns3_entry *tx_entry;
        struct hns3_desc *desc;
        uint16_t tx_next_clean;
-       int i;
+       uint16_t i;
 
        while (1) {
                if (HNS3_GET_TX_QUEUE_PEND_BD_NUM(txq) < txq->tx_rs_thresh)

diff --git a/drivers/net/hns3/hns3_rxtx_vec.h b/drivers/net/hns3/hns3_rxtx_vec.h
index 4985a7cae8236abe3c330fa41e83be4811179c0b..d13f18627d13db37c06bbd2957c6703f8a1cb953 100644 (file)
--- a/drivers/net/hns3/hns3_rxtx_vec.h
+++ b/drivers/net/hns3/hns3_rxtx_vec.h
@@ -15,7 +15,7 @@ hns3_tx_bulk_free_buffers(struct hns3_tx_queue *txq)
        struct hns3_entry *tx_entry;
        struct rte_mbuf *m;
        int nb_free = 0;
-       int i;
+       uint16_t i;
 
        tx_entry = &txq->sw_ring[txq->next_to_clean];
        if (txq->mbuf_fast_free_en) {
@@ -56,7 +56,7 @@ static inline void
 hns3_tx_free_buffers(struct hns3_tx_queue *txq)
 {
        struct hns3_desc *tx_desc;
-       int i;
+       uint16_t i;
 
        /*
         * All mbufs can be released only when the VLD bits of all