net/ipn3ke: fix line side statistics register read

[dpdk.git] / drivers / net / iavf / iavf_vchnl.c

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index da6401d..bf87ab6 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -31,7 +31,7 @@
 #define ASQ_DELAY_MS  10
 
 /* Read data in admin queue to get msg from pf driver */
-static enum iavf_status_code
+static enum iavf_status
 iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
                     uint8_t *buf)
 {
@@ -69,7 +69,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
 {
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
-       enum iavf_status_code ret;
+       enum iavf_status ret;
        int err = 0;
        int i = 0;
 
@@ -175,7 +175,7 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
        struct iavf_arq_event_info info;
        uint16_t pending, aq_opc;
        enum virtchnl_ops msg_opc;
-       enum iavf_status_code msg_ret;
+       enum iavf_status msg_ret;
        int ret;
 
        info.buf_len = IAVF_AQ_BUF_SZ;
@@ -201,7 +201,7 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
                 */
                msg_opc = (enum virtchnl_ops)rte_le_to_cpu_32(
                                                  info.desc.cookie_high);
-               msg_ret = (enum iavf_status_code)rte_le_to_cpu_32(
+               msg_ret = (enum iavf_status)rte_le_to_cpu_32(
                                                  info.desc.cookie_low);
                switch (aq_opc) {
                case iavf_aqc_opc_send_msg_to_vf:
@@ -363,7 +363,7 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
        rte_memcpy(vf->vf_res, args.out_buffer,
                   RTE_MIN(args.out_size, len));
        /* parse  VF config message back from PF*/
-       iavf_parse_hw_config(hw, vf->vf_res);
+       iavf_vf_parse_hw_config(hw, vf->vf_res);
        for (i = 0; i < vf->vf_res->num_vsis; i++) {
                if (vf->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV)
                        vf->vsi_res = &vf->vf_res->vsi_res[i];
@@ -636,7 +636,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
 {
        struct virtchnl_ether_addr_list *list;
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
-       struct ether_addr *addr;
+       struct rte_ether_addr *addr;
        struct iavf_cmd_info args;
        int len, err, i, j;
        int next_begin = 0;
@@ -647,7 +647,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
                len = sizeof(struct virtchnl_ether_addr_list);
                for (i = begin; i < IAVF_NUM_MACADDR_MAX; i++, next_begin++) {
                        addr = &adapter->eth_dev->data->mac_addrs[i];
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
                        len += sizeof(struct virtchnl_ether_addr);
                        if (len >= IAVF_AQ_BUF_SZ) {
@@ -664,7 +664,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
 
                for (i = begin; i < next_begin; i++) {
                        addr = &adapter->eth_dev->data->mac_addrs[i];
-                       if (is_zero_ether_addr(addr))
+                       if (rte_is_zero_ether_addr(addr))
                                continue;
                        rte_memcpy(list->list[j].addr, addr->addr_bytes,
                                   sizeof(addr->addr_bytes));
@@ -753,7 +753,7 @@ iavf_config_promisc(struct iavf_adapter *adapter,
 }
 
 int
-iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct ether_addr *addr,
+iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct rte_ether_addr *addr,
                     bool add)
 {
        struct virtchnl_ether_addr_list *list;