net/iavf/base: move to drivers common directory

[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 4320a7f..fa4da3a 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -19,11 +19,6 @@
 #include <rte_ethdev_driver.h>
 #include <rte_dev.h>
 
-#include "iavf_log.h"
-#include "base/iavf_prototype.h"
-#include "base/iavf_adminq_cmd.h"
-#include "base/iavf_type.h"
-
 #include "iavf.h"
 #include "iavf_rxtx.h"
 
@@ -210,12 +205,9 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
                                                        info.msg_len);
                        } else {
                                /* read message and it's expected one */
-                               if (msg_opc == vf->pend_cmd) {
-                                       vf->cmd_retval = msg_ret;
-                                       /* prevent compiler reordering */
-                                       rte_compiler_barrier();
-                                       _clear_cmd(vf);
-                               } else
+                               if (msg_opc == vf->pend_cmd)
+                                       _notify_cmd(vf, msg_ret);
+                               else
                                        PMD_DRV_LOG(ERR, "command mismatch,"
                                                    "expect %u, get %u",
                                                    vf->pend_cmd, msg_opc);
@@ -363,7 +355,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];