net/iavf: rename remaining avf strings
[dpdk.git] / drivers / net / iavf / base / iavf_adminq_cmd.h
index 7954911..353feb3 100644 (file)
@@ -31,28 +31,28 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-#ifndef _AVF_ADMINQ_CMD_H_
-#define _AVF_ADMINQ_CMD_H_
+#ifndef _IAVF_ADMINQ_CMD_H_
+#define _IAVF_ADMINQ_CMD_H_
 
-/* This header file defines the avf Admin Queue commands and is shared between
- * avf Firmware and Software.
+/* This header file defines the iavf Admin Queue commands and is shared between
+ * iavf Firmware and Software.
  *
  * This file needs to comply with the Linux Kernel coding style.
  */
 
 
-#define AVF_FW_API_VERSION_MAJOR       0x0001
-#define AVF_FW_API_VERSION_MINOR_X722  0x0005
-#define AVF_FW_API_VERSION_MINOR_X710  0x0007
+#define IAVF_FW_API_VERSION_MAJOR      0x0001
+#define IAVF_FW_API_VERSION_MINOR_X722 0x0005
+#define IAVF_FW_API_VERSION_MINOR_X710 0x0007
 
-#define AVF_FW_MINOR_VERSION(_h) ((_h)->mac.type == AVF_MAC_XL710 ? \
-                                       AVF_FW_API_VERSION_MINOR_X710 : \
-                                       AVF_FW_API_VERSION_MINOR_X722)
+#define IAVF_FW_MINOR_VERSION(_h) ((_h)->mac.type == IAVF_MAC_XL710 ? \
+                                       IAVF_FW_API_VERSION_MINOR_X710 : \
+                                       IAVF_FW_API_VERSION_MINOR_X722)
 
 /* API version 1.7 implements additional link and PHY-specific APIs  */
-#define AVF_MINOR_VER_GET_LINK_INFO_XL710 0x0007
+#define IAVF_MINOR_VER_GET_LINK_INFO_XL710 0x0007
 
-struct avf_aq_desc {
+struct iavf_aq_desc {
        __le16 flags;
        __le16 opcode;
        __le16 datalen;
@@ -82,242 +82,242 @@ struct avf_aq_desc {
  */
 
 /* command flags and offsets*/
-#define AVF_AQ_FLAG_DD_SHIFT   0
-#define AVF_AQ_FLAG_CMP_SHIFT  1
-#define AVF_AQ_FLAG_ERR_SHIFT  2
-#define AVF_AQ_FLAG_VFE_SHIFT  3
-#define AVF_AQ_FLAG_LB_SHIFT   9
-#define AVF_AQ_FLAG_RD_SHIFT   10
-#define AVF_AQ_FLAG_VFC_SHIFT  11
-#define AVF_AQ_FLAG_BUF_SHIFT  12
-#define AVF_AQ_FLAG_SI_SHIFT   13
-#define AVF_AQ_FLAG_EI_SHIFT   14
-#define AVF_AQ_FLAG_FE_SHIFT   15
-
-#define AVF_AQ_FLAG_DD         (1 << AVF_AQ_FLAG_DD_SHIFT)  /* 0x1    */
-#define AVF_AQ_FLAG_CMP        (1 << AVF_AQ_FLAG_CMP_SHIFT) /* 0x2    */
-#define AVF_AQ_FLAG_ERR        (1 << AVF_AQ_FLAG_ERR_SHIFT) /* 0x4    */
-#define AVF_AQ_FLAG_VFE        (1 << AVF_AQ_FLAG_VFE_SHIFT) /* 0x8    */
-#define AVF_AQ_FLAG_LB         (1 << AVF_AQ_FLAG_LB_SHIFT)  /* 0x200  */
-#define AVF_AQ_FLAG_RD         (1 << AVF_AQ_FLAG_RD_SHIFT)  /* 0x400  */
-#define AVF_AQ_FLAG_VFC        (1 << AVF_AQ_FLAG_VFC_SHIFT) /* 0x800  */
-#define AVF_AQ_FLAG_BUF        (1 << AVF_AQ_FLAG_BUF_SHIFT) /* 0x1000 */
-#define AVF_AQ_FLAG_SI         (1 << AVF_AQ_FLAG_SI_SHIFT)  /* 0x2000 */
-#define AVF_AQ_FLAG_EI         (1 << AVF_AQ_FLAG_EI_SHIFT)  /* 0x4000 */
-#define AVF_AQ_FLAG_FE         (1 << AVF_AQ_FLAG_FE_SHIFT)  /* 0x8000 */
+#define IAVF_AQ_FLAG_DD_SHIFT  0
+#define IAVF_AQ_FLAG_CMP_SHIFT 1
+#define IAVF_AQ_FLAG_ERR_SHIFT 2
+#define IAVF_AQ_FLAG_VFE_SHIFT 3
+#define IAVF_AQ_FLAG_LB_SHIFT  9
+#define IAVF_AQ_FLAG_RD_SHIFT  10
+#define IAVF_AQ_FLAG_VFC_SHIFT 11
+#define IAVF_AQ_FLAG_BUF_SHIFT 12
+#define IAVF_AQ_FLAG_SI_SHIFT  13
+#define IAVF_AQ_FLAG_EI_SHIFT  14
+#define IAVF_AQ_FLAG_FE_SHIFT  15
+
+#define IAVF_AQ_FLAG_DD                (1 << IAVF_AQ_FLAG_DD_SHIFT)  /* 0x1    */
+#define IAVF_AQ_FLAG_CMP       (1 << IAVF_AQ_FLAG_CMP_SHIFT) /* 0x2    */
+#define IAVF_AQ_FLAG_ERR       (1 << IAVF_AQ_FLAG_ERR_SHIFT) /* 0x4    */
+#define IAVF_AQ_FLAG_VFE       (1 << IAVF_AQ_FLAG_VFE_SHIFT) /* 0x8    */
+#define IAVF_AQ_FLAG_LB                (1 << IAVF_AQ_FLAG_LB_SHIFT)  /* 0x200  */
+#define IAVF_AQ_FLAG_RD                (1 << IAVF_AQ_FLAG_RD_SHIFT)  /* 0x400  */
+#define IAVF_AQ_FLAG_VFC       (1 << IAVF_AQ_FLAG_VFC_SHIFT) /* 0x800  */
+#define IAVF_AQ_FLAG_BUF       (1 << IAVF_AQ_FLAG_BUF_SHIFT) /* 0x1000 */
+#define IAVF_AQ_FLAG_SI                (1 << IAVF_AQ_FLAG_SI_SHIFT)  /* 0x2000 */
+#define IAVF_AQ_FLAG_EI                (1 << IAVF_AQ_FLAG_EI_SHIFT)  /* 0x4000 */
+#define IAVF_AQ_FLAG_FE                (1 << IAVF_AQ_FLAG_FE_SHIFT)  /* 0x8000 */
 
 /* error codes */
-enum avf_admin_queue_err {
-       AVF_AQ_RC_OK            = 0,  /* success */
-       AVF_AQ_RC_EPERM = 1,  /* Operation not permitted */
-       AVF_AQ_RC_ENOENT        = 2,  /* No such element */
-       AVF_AQ_RC_ESRCH = 3,  /* Bad opcode */
-       AVF_AQ_RC_EINTR = 4,  /* operation interrupted */
-       AVF_AQ_RC_EIO           = 5,  /* I/O error */
-       AVF_AQ_RC_ENXIO = 6,  /* No such resource */
-       AVF_AQ_RC_E2BIG = 7,  /* Arg too long */
-       AVF_AQ_RC_EAGAIN        = 8,  /* Try again */
-       AVF_AQ_RC_ENOMEM        = 9,  /* Out of memory */
-       AVF_AQ_RC_EACCES        = 10, /* Permission denied */
-       AVF_AQ_RC_EFAULT        = 11, /* Bad address */
-       AVF_AQ_RC_EBUSY = 12, /* Device or resource busy */
-       AVF_AQ_RC_EEXIST        = 13, /* object already exists */
-       AVF_AQ_RC_EINVAL        = 14, /* Invalid argument */
-       AVF_AQ_RC_ENOTTY        = 15, /* Not a typewriter */
-       AVF_AQ_RC_ENOSPC        = 16, /* No space left or alloc failure */
-       AVF_AQ_RC_ENOSYS        = 17, /* Function not implemented */
-       AVF_AQ_RC_ERANGE        = 18, /* Parameter out of range */
-       AVF_AQ_RC_EFLUSHED      = 19, /* Cmd flushed due to prev cmd error */
-       AVF_AQ_RC_BAD_ADDR      = 20, /* Descriptor contains a bad pointer */
-       AVF_AQ_RC_EMODE = 21, /* Op not allowed in current dev mode */
-       AVF_AQ_RC_EFBIG = 22, /* File too large */
+enum iavf_admin_queue_err {
+       IAVF_AQ_RC_OK           = 0,  /* success */
+       IAVF_AQ_RC_EPERM        = 1,  /* Operation not permitted */
+       IAVF_AQ_RC_ENOENT       = 2,  /* No such element */
+       IAVF_AQ_RC_ESRCH        = 3,  /* Bad opcode */
+       IAVF_AQ_RC_EINTR        = 4,  /* operation interrupted */
+       IAVF_AQ_RC_EIO          = 5,  /* I/O error */
+       IAVF_AQ_RC_ENXIO        = 6,  /* No such resource */
+       IAVF_AQ_RC_E2BIG        = 7,  /* Arg too long */
+       IAVF_AQ_RC_EAGAIN       = 8,  /* Try again */
+       IAVF_AQ_RC_ENOMEM       = 9,  /* Out of memory */
+       IAVF_AQ_RC_EACCES       = 10, /* Permission denied */
+       IAVF_AQ_RC_EFAULT       = 11, /* Bad address */
+       IAVF_AQ_RC_EBUSY        = 12, /* Device or resource busy */
+       IAVF_AQ_RC_EEXIST       = 13, /* object already exists */
+       IAVF_AQ_RC_EINVAL       = 14, /* Invalid argument */
+       IAVF_AQ_RC_ENOTTY       = 15, /* Not a typewriter */
+       IAVF_AQ_RC_ENOSPC       = 16, /* No space left or alloc failure */
+       IAVF_AQ_RC_ENOSYS       = 17, /* Function not implemented */
+       IAVF_AQ_RC_ERANGE       = 18, /* Parameter out of range */
+       IAVF_AQ_RC_EFLUSHED     = 19, /* Cmd flushed due to prev cmd error */
+       IAVF_AQ_RC_BAD_ADDR     = 20, /* Descriptor contains a bad pointer */
+       IAVF_AQ_RC_EMODE        = 21, /* Op not allowed in current dev mode */
+       IAVF_AQ_RC_EFBIG        = 22, /* File too large */
 };
 
 /* Admin Queue command opcodes */
-enum avf_admin_queue_opc {
+enum iavf_admin_queue_opc {
        /* aq commands */
-       avf_aqc_opc_get_version = 0x0001,
-       avf_aqc_opc_driver_version      = 0x0002,
-       avf_aqc_opc_queue_shutdown      = 0x0003,
-       avf_aqc_opc_set_pf_context      = 0x0004,
+       iavf_aqc_opc_get_version        = 0x0001,
+       iavf_aqc_opc_driver_version     = 0x0002,
+       iavf_aqc_opc_queue_shutdown     = 0x0003,
+       iavf_aqc_opc_set_pf_context     = 0x0004,
 
        /* resource ownership */
-       avf_aqc_opc_request_resource    = 0x0008,
-       avf_aqc_opc_release_resource    = 0x0009,
+       iavf_aqc_opc_request_resource   = 0x0008,
+       iavf_aqc_opc_release_resource   = 0x0009,
 
-       avf_aqc_opc_list_func_capabilities      = 0x000A,
-       avf_aqc_opc_list_dev_capabilities       = 0x000B,
+       iavf_aqc_opc_list_func_capabilities     = 0x000A,
+       iavf_aqc_opc_list_dev_capabilities      = 0x000B,
 
        /* Proxy commands */
-       avf_aqc_opc_set_proxy_config            = 0x0104,
-       avf_aqc_opc_set_ns_proxy_table_entry    = 0x0105,
+       iavf_aqc_opc_set_proxy_config           = 0x0104,
+       iavf_aqc_opc_set_ns_proxy_table_entry   = 0x0105,
 
        /* LAA */
-       avf_aqc_opc_mac_address_read    = 0x0107,
-       avf_aqc_opc_mac_address_write   = 0x0108,
+       iavf_aqc_opc_mac_address_read   = 0x0107,
+       iavf_aqc_opc_mac_address_write  = 0x0108,
 
        /* PXE */
-       avf_aqc_opc_clear_pxe_mode      = 0x0110,
+       iavf_aqc_opc_clear_pxe_mode     = 0x0110,
 
        /* WoL commands */
-       avf_aqc_opc_set_wol_filter      = 0x0120,
-       avf_aqc_opc_get_wake_reason     = 0x0121,
-       avf_aqc_opc_clear_all_wol_filters = 0x025E,
+       iavf_aqc_opc_set_wol_filter     = 0x0120,
+       iavf_aqc_opc_get_wake_reason    = 0x0121,
+       iavf_aqc_opc_clear_all_wol_filters = 0x025E,
 
        /* internal switch commands */
-       avf_aqc_opc_get_switch_config           = 0x0200,
-       avf_aqc_opc_add_statistics              = 0x0201,
-       avf_aqc_opc_remove_statistics           = 0x0202,
-       avf_aqc_opc_set_port_parameters = 0x0203,
-       avf_aqc_opc_get_switch_resource_alloc   = 0x0204,
-       avf_aqc_opc_set_switch_config           = 0x0205,
-       avf_aqc_opc_rx_ctl_reg_read             = 0x0206,
-       avf_aqc_opc_rx_ctl_reg_write            = 0x0207,
-
-       avf_aqc_opc_add_vsi                     = 0x0210,
-       avf_aqc_opc_update_vsi_parameters       = 0x0211,
-       avf_aqc_opc_get_vsi_parameters          = 0x0212,
-
-       avf_aqc_opc_add_pv                      = 0x0220,
-       avf_aqc_opc_update_pv_parameters        = 0x0221,
-       avf_aqc_opc_get_pv_parameters           = 0x0222,
-
-       avf_aqc_opc_add_veb                     = 0x0230,
-       avf_aqc_opc_update_veb_parameters       = 0x0231,
-       avf_aqc_opc_get_veb_parameters          = 0x0232,
-
-       avf_aqc_opc_delete_element              = 0x0243,
-
-       avf_aqc_opc_add_macvlan         = 0x0250,
-       avf_aqc_opc_remove_macvlan              = 0x0251,
-       avf_aqc_opc_add_vlan                    = 0x0252,
-       avf_aqc_opc_remove_vlan         = 0x0253,
-       avf_aqc_opc_set_vsi_promiscuous_modes   = 0x0254,
-       avf_aqc_opc_add_tag                     = 0x0255,
-       avf_aqc_opc_remove_tag                  = 0x0256,
-       avf_aqc_opc_add_multicast_etag          = 0x0257,
-       avf_aqc_opc_remove_multicast_etag       = 0x0258,
-       avf_aqc_opc_update_tag                  = 0x0259,
-       avf_aqc_opc_add_control_packet_filter   = 0x025A,
-       avf_aqc_opc_remove_control_packet_filter        = 0x025B,
-       avf_aqc_opc_add_cloud_filters           = 0x025C,
-       avf_aqc_opc_remove_cloud_filters        = 0x025D,
-       avf_aqc_opc_clear_wol_switch_filters    = 0x025E,
-       avf_aqc_opc_replace_cloud_filters       = 0x025F,
-
-       avf_aqc_opc_add_mirror_rule     = 0x0260,
-       avf_aqc_opc_delete_mirror_rule  = 0x0261,
+       iavf_aqc_opc_get_switch_config          = 0x0200,
+       iavf_aqc_opc_add_statistics             = 0x0201,
+       iavf_aqc_opc_remove_statistics          = 0x0202,
+       iavf_aqc_opc_set_port_parameters        = 0x0203,
+       iavf_aqc_opc_get_switch_resource_alloc  = 0x0204,
+       iavf_aqc_opc_set_switch_config          = 0x0205,
+       iavf_aqc_opc_rx_ctl_reg_read            = 0x0206,
+       iavf_aqc_opc_rx_ctl_reg_write           = 0x0207,
+
+       iavf_aqc_opc_add_vsi                    = 0x0210,
+       iavf_aqc_opc_update_vsi_parameters      = 0x0211,
+       iavf_aqc_opc_get_vsi_parameters         = 0x0212,
+
+       iavf_aqc_opc_add_pv                     = 0x0220,
+       iavf_aqc_opc_update_pv_parameters       = 0x0221,
+       iavf_aqc_opc_get_pv_parameters          = 0x0222,
+
+       iavf_aqc_opc_add_veb                    = 0x0230,
+       iavf_aqc_opc_update_veb_parameters      = 0x0231,
+       iavf_aqc_opc_get_veb_parameters         = 0x0232,
+
+       iavf_aqc_opc_delete_element             = 0x0243,
+
+       iavf_aqc_opc_add_macvlan                = 0x0250,
+       iavf_aqc_opc_remove_macvlan             = 0x0251,
+       iavf_aqc_opc_add_vlan                   = 0x0252,
+       iavf_aqc_opc_remove_vlan                = 0x0253,
+       iavf_aqc_opc_set_vsi_promiscuous_modes  = 0x0254,
+       iavf_aqc_opc_add_tag                    = 0x0255,
+       iavf_aqc_opc_remove_tag                 = 0x0256,
+       iavf_aqc_opc_add_multicast_etag         = 0x0257,
+       iavf_aqc_opc_remove_multicast_etag      = 0x0258,
+       iavf_aqc_opc_update_tag                 = 0x0259,
+       iavf_aqc_opc_add_control_packet_filter  = 0x025A,
+       iavf_aqc_opc_remove_control_packet_filter       = 0x025B,
+       iavf_aqc_opc_add_cloud_filters          = 0x025C,
+       iavf_aqc_opc_remove_cloud_filters       = 0x025D,
+       iavf_aqc_opc_clear_wol_switch_filters   = 0x025E,
+       iavf_aqc_opc_replace_cloud_filters      = 0x025F,
+
+       iavf_aqc_opc_add_mirror_rule    = 0x0260,
+       iavf_aqc_opc_delete_mirror_rule = 0x0261,
 
        /* Dynamic Device Personalization */
-       avf_aqc_opc_write_personalization_profile       = 0x0270,
-       avf_aqc_opc_get_personalization_profile_list    = 0x0271,
+       iavf_aqc_opc_write_personalization_profile      = 0x0270,
+       iavf_aqc_opc_get_personalization_profile_list   = 0x0271,
 
        /* DCB commands */
-       avf_aqc_opc_dcb_ignore_pfc      = 0x0301,
-       avf_aqc_opc_dcb_updated = 0x0302,
-       avf_aqc_opc_set_dcb_parameters = 0x0303,
+       iavf_aqc_opc_dcb_ignore_pfc     = 0x0301,
+       iavf_aqc_opc_dcb_updated        = 0x0302,
+       iavf_aqc_opc_set_dcb_parameters = 0x0303,
 
        /* TX scheduler */
-       avf_aqc_opc_configure_vsi_bw_limit              = 0x0400,
-       avf_aqc_opc_configure_vsi_ets_sla_bw_limit      = 0x0406,
-       avf_aqc_opc_configure_vsi_tc_bw         = 0x0407,
-       avf_aqc_opc_query_vsi_bw_config         = 0x0408,
-       avf_aqc_opc_query_vsi_ets_sla_config            = 0x040A,
-       avf_aqc_opc_configure_switching_comp_bw_limit   = 0x0410,
-
-       avf_aqc_opc_enable_switching_comp_ets                   = 0x0413,
-       avf_aqc_opc_modify_switching_comp_ets                   = 0x0414,
-       avf_aqc_opc_disable_switching_comp_ets                  = 0x0415,
-       avf_aqc_opc_configure_switching_comp_ets_bw_limit       = 0x0416,
-       avf_aqc_opc_configure_switching_comp_bw_config          = 0x0417,
-       avf_aqc_opc_query_switching_comp_ets_config             = 0x0418,
-       avf_aqc_opc_query_port_ets_config                       = 0x0419,
-       avf_aqc_opc_query_switching_comp_bw_config              = 0x041A,
-       avf_aqc_opc_suspend_port_tx                             = 0x041B,
-       avf_aqc_opc_resume_port_tx                              = 0x041C,
-       avf_aqc_opc_configure_partition_bw                      = 0x041D,
+       iavf_aqc_opc_configure_vsi_bw_limit             = 0x0400,
+       iavf_aqc_opc_configure_vsi_ets_sla_bw_limit     = 0x0406,
+       iavf_aqc_opc_configure_vsi_tc_bw                = 0x0407,
+       iavf_aqc_opc_query_vsi_bw_config                = 0x0408,
+       iavf_aqc_opc_query_vsi_ets_sla_config           = 0x040A,
+       iavf_aqc_opc_configure_switching_comp_bw_limit  = 0x0410,
+
+       iavf_aqc_opc_enable_switching_comp_ets                  = 0x0413,
+       iavf_aqc_opc_modify_switching_comp_ets                  = 0x0414,
+       iavf_aqc_opc_disable_switching_comp_ets                 = 0x0415,
+       iavf_aqc_opc_configure_switching_comp_ets_bw_limit      = 0x0416,
+       iavf_aqc_opc_configure_switching_comp_bw_config         = 0x0417,
+       iavf_aqc_opc_query_switching_comp_ets_config            = 0x0418,
+       iavf_aqc_opc_query_port_ets_config                      = 0x0419,
+       iavf_aqc_opc_query_switching_comp_bw_config             = 0x041A,
+       iavf_aqc_opc_suspend_port_tx                            = 0x041B,
+       iavf_aqc_opc_resume_port_tx                             = 0x041C,
+       iavf_aqc_opc_configure_partition_bw                     = 0x041D,
        /* hmc */
-       avf_aqc_opc_query_hmc_resource_profile  = 0x0500,
-       avf_aqc_opc_set_hmc_resource_profile    = 0x0501,
+       iavf_aqc_opc_query_hmc_resource_profile = 0x0500,
+       iavf_aqc_opc_set_hmc_resource_profile   = 0x0501,
 
        /* phy commands*/
 
        /* phy commands*/
-       avf_aqc_opc_get_phy_abilities           = 0x0600,
-       avf_aqc_opc_set_phy_config              = 0x0601,
-       avf_aqc_opc_set_mac_config              = 0x0603,
-       avf_aqc_opc_set_link_restart_an = 0x0605,
-       avf_aqc_opc_get_link_status             = 0x0607,
-       avf_aqc_opc_set_phy_int_mask            = 0x0613,
-       avf_aqc_opc_get_local_advt_reg          = 0x0614,
-       avf_aqc_opc_set_local_advt_reg          = 0x0615,
-       avf_aqc_opc_get_partner_advt            = 0x0616,
-       avf_aqc_opc_set_lb_modes                = 0x0618,
-       avf_aqc_opc_get_phy_wol_caps            = 0x0621,
-       avf_aqc_opc_set_phy_debug               = 0x0622,
-       avf_aqc_opc_upload_ext_phy_fm           = 0x0625,
-       avf_aqc_opc_run_phy_activity            = 0x0626,
-       avf_aqc_opc_set_phy_register            = 0x0628,
-       avf_aqc_opc_get_phy_register            = 0x0629,
+       iavf_aqc_opc_get_phy_abilities          = 0x0600,
+       iavf_aqc_opc_set_phy_config             = 0x0601,
+       iavf_aqc_opc_set_mac_config             = 0x0603,
+       iavf_aqc_opc_set_link_restart_an        = 0x0605,
+       iavf_aqc_opc_get_link_status            = 0x0607,
+       iavf_aqc_opc_set_phy_int_mask           = 0x0613,
+       iavf_aqc_opc_get_local_advt_reg         = 0x0614,
+       iavf_aqc_opc_set_local_advt_reg         = 0x0615,
+       iavf_aqc_opc_get_partner_advt           = 0x0616,
+       iavf_aqc_opc_set_lb_modes               = 0x0618,
+       iavf_aqc_opc_get_phy_wol_caps           = 0x0621,
+       iavf_aqc_opc_set_phy_debug              = 0x0622,
+       iavf_aqc_opc_upload_ext_phy_fm          = 0x0625,
+       iavf_aqc_opc_run_phy_activity           = 0x0626,
+       iavf_aqc_opc_set_phy_register           = 0x0628,
+       iavf_aqc_opc_get_phy_register           = 0x0629,
 
        /* NVM commands */
-       avf_aqc_opc_nvm_read                    = 0x0701,
-       avf_aqc_opc_nvm_erase                   = 0x0702,
-       avf_aqc_opc_nvm_update                  = 0x0703,
-       avf_aqc_opc_nvm_config_read             = 0x0704,
-       avf_aqc_opc_nvm_config_write            = 0x0705,
-       avf_aqc_opc_nvm_progress                = 0x0706,
-       avf_aqc_opc_oem_post_update             = 0x0720,
-       avf_aqc_opc_thermal_sensor              = 0x0721,
+       iavf_aqc_opc_nvm_read                   = 0x0701,
+       iavf_aqc_opc_nvm_erase                  = 0x0702,
+       iavf_aqc_opc_nvm_update                 = 0x0703,
+       iavf_aqc_opc_nvm_config_read            = 0x0704,
+       iavf_aqc_opc_nvm_config_write           = 0x0705,
+       iavf_aqc_opc_nvm_progress               = 0x0706,
+       iavf_aqc_opc_oem_post_update            = 0x0720,
+       iavf_aqc_opc_thermal_sensor             = 0x0721,
 
        /* virtualization commands */
-       avf_aqc_opc_send_msg_to_pf              = 0x0801,
-       avf_aqc_opc_send_msg_to_vf              = 0x0802,
-       avf_aqc_opc_send_msg_to_peer            = 0x0803,
+       iavf_aqc_opc_send_msg_to_pf             = 0x0801,
+       iavf_aqc_opc_send_msg_to_vf             = 0x0802,
+       iavf_aqc_opc_send_msg_to_peer           = 0x0803,
 
        /* alternate structure */
-       avf_aqc_opc_alternate_write             = 0x0900,
-       avf_aqc_opc_alternate_write_indirect    = 0x0901,
-       avf_aqc_opc_alternate_read              = 0x0902,
-       avf_aqc_opc_alternate_read_indirect     = 0x0903,
-       avf_aqc_opc_alternate_write_done        = 0x0904,
-       avf_aqc_opc_alternate_set_mode          = 0x0905,
-       avf_aqc_opc_alternate_clear_port        = 0x0906,
+       iavf_aqc_opc_alternate_write            = 0x0900,
+       iavf_aqc_opc_alternate_write_indirect   = 0x0901,
+       iavf_aqc_opc_alternate_read             = 0x0902,
+       iavf_aqc_opc_alternate_read_indirect    = 0x0903,
+       iavf_aqc_opc_alternate_write_done       = 0x0904,
+       iavf_aqc_opc_alternate_set_mode         = 0x0905,
+       iavf_aqc_opc_alternate_clear_port       = 0x0906,
 
        /* LLDP commands */
-       avf_aqc_opc_lldp_get_mib        = 0x0A00,
-       avf_aqc_opc_lldp_update_mib     = 0x0A01,
-       avf_aqc_opc_lldp_add_tlv        = 0x0A02,
-       avf_aqc_opc_lldp_update_tlv     = 0x0A03,
-       avf_aqc_opc_lldp_delete_tlv     = 0x0A04,
-       avf_aqc_opc_lldp_stop           = 0x0A05,
-       avf_aqc_opc_lldp_start          = 0x0A06,
-       avf_aqc_opc_get_cee_dcb_cfg     = 0x0A07,
-       avf_aqc_opc_lldp_set_local_mib  = 0x0A08,
-       avf_aqc_opc_lldp_stop_start_spec_agent  = 0x0A09,
+       iavf_aqc_opc_lldp_get_mib       = 0x0A00,
+       iavf_aqc_opc_lldp_update_mib    = 0x0A01,
+       iavf_aqc_opc_lldp_add_tlv       = 0x0A02,
+       iavf_aqc_opc_lldp_update_tlv    = 0x0A03,
+       iavf_aqc_opc_lldp_delete_tlv    = 0x0A04,
+       iavf_aqc_opc_lldp_stop          = 0x0A05,
+       iavf_aqc_opc_lldp_start         = 0x0A06,
+       iavf_aqc_opc_get_cee_dcb_cfg    = 0x0A07,
+       iavf_aqc_opc_lldp_set_local_mib = 0x0A08,
+       iavf_aqc_opc_lldp_stop_start_spec_agent = 0x0A09,
 
        /* Tunnel commands */
-       avf_aqc_opc_add_udp_tunnel      = 0x0B00,
-       avf_aqc_opc_del_udp_tunnel      = 0x0B01,
-       avf_aqc_opc_set_rss_key = 0x0B02,
-       avf_aqc_opc_set_rss_lut = 0x0B03,
-       avf_aqc_opc_get_rss_key = 0x0B04,
-       avf_aqc_opc_get_rss_lut = 0x0B05,
+       iavf_aqc_opc_add_udp_tunnel     = 0x0B00,
+       iavf_aqc_opc_del_udp_tunnel     = 0x0B01,
+       iavf_aqc_opc_set_rss_key        = 0x0B02,
+       iavf_aqc_opc_set_rss_lut        = 0x0B03,
+       iavf_aqc_opc_get_rss_key        = 0x0B04,
+       iavf_aqc_opc_get_rss_lut        = 0x0B05,
 
        /* Async Events */
-       avf_aqc_opc_event_lan_overflow          = 0x1001,
+       iavf_aqc_opc_event_lan_overflow         = 0x1001,
 
        /* OEM commands */
-       avf_aqc_opc_oem_parameter_change        = 0xFE00,
-       avf_aqc_opc_oem_device_status_change    = 0xFE01,
-       avf_aqc_opc_oem_ocsd_initialize = 0xFE02,
-       avf_aqc_opc_oem_ocbb_initialize = 0xFE03,
+       iavf_aqc_opc_oem_parameter_change       = 0xFE00,
+       iavf_aqc_opc_oem_device_status_change   = 0xFE01,
+       iavf_aqc_opc_oem_ocsd_initialize        = 0xFE02,
+       iavf_aqc_opc_oem_ocbb_initialize        = 0xFE03,
 
        /* debug commands */
-       avf_aqc_opc_debug_read_reg              = 0xFF03,
-       avf_aqc_opc_debug_write_reg             = 0xFF04,
-       avf_aqc_opc_debug_modify_reg            = 0xFF07,
-       avf_aqc_opc_debug_dump_internals        = 0xFF08,
+       iavf_aqc_opc_debug_read_reg             = 0xFF03,
+       iavf_aqc_opc_debug_write_reg            = 0xFF04,
+       iavf_aqc_opc_debug_modify_reg           = 0xFF07,
+       iavf_aqc_opc_debug_dump_internals       = 0xFF08,
 };
 
 /* command structures and indirect data structures */
@@ -338,18 +338,18 @@ enum avf_admin_queue_opc {
  * structure is not of the correct size, otherwise it creates an enum that is
  * never used.
  */
-#define AVF_CHECK_STRUCT_LEN(n, X) enum avf_static_assert_enum_##X \
-       { avf_static_assert_##X = (n)/((sizeof(struct X) == (n)) ? 1 : 0) }
+#define IAVF_CHECK_STRUCT_LEN(n, X) enum iavf_static_assert_enum_##X \
+       { iavf_static_assert_##X = (n)/((sizeof(struct X) == (n)) ? 1 : 0) }
 
 /* This macro is used extensively to ensure that command structures are 16
  * bytes in length as they have to map to the raw array of that size.
  */
-#define AVF_CHECK_CMD_LENGTH(X)        AVF_CHECK_STRUCT_LEN(16, X)
+#define IAVF_CHECK_CMD_LENGTH(X)       IAVF_CHECK_STRUCT_LEN(16, X)
 
 /* internal (0x00XX) commands */
 
 /* Get version (direct 0x0001) */
-struct avf_aqc_get_version {
+struct iavf_aqc_get_version {
        __le32 rom_ver;
        __le32 fw_build;
        __le16 fw_major;
@@ -358,10 +358,10 @@ struct avf_aqc_get_version {
        __le16 api_minor;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_version);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_version);
 
 /* Send driver version (indirect 0x0002) */
-struct avf_aqc_driver_version {
+struct iavf_aqc_driver_version {
        u8      driver_major_ver;
        u8      driver_minor_ver;
        u8      driver_build_ver;
@@ -371,36 +371,36 @@ struct avf_aqc_driver_version {
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_driver_version);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_driver_version);
 
 /* Queue Shutdown (direct 0x0003) */
-struct avf_aqc_queue_shutdown {
+struct iavf_aqc_queue_shutdown {
        __le32  driver_unloading;
-#define AVF_AQ_DRIVER_UNLOADING        0x1
+#define IAVF_AQ_DRIVER_UNLOADING       0x1
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_queue_shutdown);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_queue_shutdown);
 
 /* Set PF context (0x0004, direct) */
-struct avf_aqc_set_pf_context {
+struct iavf_aqc_set_pf_context {
        u8      pf_id;
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_pf_context);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_pf_context);
 
 /* Request resource ownership (direct 0x0008)
  * Release resource ownership (direct 0x0009)
  */
-#define AVF_AQ_RESOURCE_NVM                    1
-#define AVF_AQ_RESOURCE_SDP                    2
-#define AVF_AQ_RESOURCE_ACCESS_READ            1
-#define AVF_AQ_RESOURCE_ACCESS_WRITE           2
-#define AVF_AQ_RESOURCE_NVM_READ_TIMEOUT       3000
-#define AVF_AQ_RESOURCE_NVM_WRITE_TIMEOUT      180000
-
-struct avf_aqc_request_resource {
+#define IAVF_AQ_RESOURCE_NVM                   1
+#define IAVF_AQ_RESOURCE_SDP                   2
+#define IAVF_AQ_RESOURCE_ACCESS_READ           1
+#define IAVF_AQ_RESOURCE_ACCESS_WRITE          2
+#define IAVF_AQ_RESOURCE_NVM_READ_TIMEOUT      3000
+#define IAVF_AQ_RESOURCE_NVM_WRITE_TIMEOUT     180000
+
+struct iavf_aqc_request_resource {
        __le16  resource_id;
        __le16  access_type;
        __le32  timeout;
@@ -408,14 +408,14 @@ struct avf_aqc_request_resource {
        u8      reserved[4];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_request_resource);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_request_resource);
 
 /* Get function capabilities (indirect 0x000A)
  * Get device capabilities (indirect 0x000B)
  */
-struct avf_aqc_list_capabilites {
+struct iavf_aqc_list_capabilites {
        u8 command_flags;
-#define AVF_AQ_LIST_CAP_PF_INDEX_EN    1
+#define IAVF_AQ_LIST_CAP_PF_INDEX_EN   1
        u8 pf_index;
        u8 reserved[2];
        __le32 count;
@@ -423,9 +423,9 @@ struct avf_aqc_list_capabilites {
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_list_capabilites);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_list_capabilites);
 
-struct avf_aqc_list_capabilities_element_resp {
+struct iavf_aqc_list_capabilities_element_resp {
        __le16  id;
        u8      major_rev;
        u8      minor_rev;
@@ -437,46 +437,46 @@ struct avf_aqc_list_capabilities_element_resp {
 
 /* list of caps */
 
-#define AVF_AQ_CAP_ID_SWITCH_MODE      0x0001
-#define AVF_AQ_CAP_ID_MNG_MODE         0x0002
-#define AVF_AQ_CAP_ID_NPAR_ACTIVE      0x0003
-#define AVF_AQ_CAP_ID_OS2BMC_CAP       0x0004
-#define AVF_AQ_CAP_ID_FUNCTIONS_VALID  0x0005
-#define AVF_AQ_CAP_ID_ALTERNATE_RAM    0x0006
-#define AVF_AQ_CAP_ID_WOL_AND_PROXY    0x0008
-#define AVF_AQ_CAP_ID_SRIOV            0x0012
-#define AVF_AQ_CAP_ID_VF               0x0013
-#define AVF_AQ_CAP_ID_VMDQ             0x0014
-#define AVF_AQ_CAP_ID_8021QBG          0x0015
-#define AVF_AQ_CAP_ID_8021QBR          0x0016
-#define AVF_AQ_CAP_ID_VSI              0x0017
-#define AVF_AQ_CAP_ID_DCB              0x0018
-#define AVF_AQ_CAP_ID_FCOE             0x0021
-#define AVF_AQ_CAP_ID_ISCSI            0x0022
-#define AVF_AQ_CAP_ID_RSS              0x0040
-#define AVF_AQ_CAP_ID_RXQ              0x0041
-#define AVF_AQ_CAP_ID_TXQ              0x0042
-#define AVF_AQ_CAP_ID_MSIX             0x0043
-#define AVF_AQ_CAP_ID_VF_MSIX          0x0044
-#define AVF_AQ_CAP_ID_FLOW_DIRECTOR    0x0045
-#define AVF_AQ_CAP_ID_1588             0x0046
-#define AVF_AQ_CAP_ID_IWARP            0x0051
-#define AVF_AQ_CAP_ID_LED              0x0061
-#define AVF_AQ_CAP_ID_SDP              0x0062
-#define AVF_AQ_CAP_ID_MDIO             0x0063
-#define AVF_AQ_CAP_ID_WSR_PROT         0x0064
-#define AVF_AQ_CAP_ID_NVM_MGMT         0x0080
-#define AVF_AQ_CAP_ID_FLEX10           0x00F1
-#define AVF_AQ_CAP_ID_CEM              0x00F2
+#define IAVF_AQ_CAP_ID_SWITCH_MODE     0x0001
+#define IAVF_AQ_CAP_ID_MNG_MODE                0x0002
+#define IAVF_AQ_CAP_ID_NPAR_ACTIVE     0x0003
+#define IAVF_AQ_CAP_ID_OS2BMC_CAP      0x0004
+#define IAVF_AQ_CAP_ID_FUNCTIONS_VALID 0x0005
+#define IAVF_AQ_CAP_ID_ALTERNATE_RAM   0x0006
+#define IAVF_AQ_CAP_ID_WOL_AND_PROXY   0x0008
+#define IAVF_AQ_CAP_ID_SRIOV           0x0012
+#define IAVF_AQ_CAP_ID_VF              0x0013
+#define IAVF_AQ_CAP_ID_VMDQ            0x0014
+#define IAVF_AQ_CAP_ID_8021QBG         0x0015
+#define IAVF_AQ_CAP_ID_8021QBR         0x0016
+#define IAVF_AQ_CAP_ID_VSI             0x0017
+#define IAVF_AQ_CAP_ID_DCB             0x0018
+#define IAVF_AQ_CAP_ID_FCOE            0x0021
+#define IAVF_AQ_CAP_ID_ISCSI           0x0022
+#define IAVF_AQ_CAP_ID_RSS             0x0040
+#define IAVF_AQ_CAP_ID_RXQ             0x0041
+#define IAVF_AQ_CAP_ID_TXQ             0x0042
+#define IAVF_AQ_CAP_ID_MSIX            0x0043
+#define IAVF_AQ_CAP_ID_VF_MSIX         0x0044
+#define IAVF_AQ_CAP_ID_FLOW_DIRECTOR   0x0045
+#define IAVF_AQ_CAP_ID_1588            0x0046
+#define IAVF_AQ_CAP_ID_IWARP           0x0051
+#define IAVF_AQ_CAP_ID_LED             0x0061
+#define IAVF_AQ_CAP_ID_SDP             0x0062
+#define IAVF_AQ_CAP_ID_MDIO            0x0063
+#define IAVF_AQ_CAP_ID_WSR_PROT                0x0064
+#define IAVF_AQ_CAP_ID_NVM_MGMT                0x0080
+#define IAVF_AQ_CAP_ID_FLEX10          0x00F1
+#define IAVF_AQ_CAP_ID_CEM             0x00F2
 
 /* Set CPPM Configuration (direct 0x0103) */
-struct avf_aqc_cppm_configuration {
+struct iavf_aqc_cppm_configuration {
        __le16  command_flags;
-#define AVF_AQ_CPPM_EN_LTRC    0x0800
-#define AVF_AQ_CPPM_EN_DMCTH   0x1000
-#define AVF_AQ_CPPM_EN_DMCTLX  0x2000
-#define AVF_AQ_CPPM_EN_HPTC    0x4000
-#define AVF_AQ_CPPM_EN_DMARC   0x8000
+#define IAVF_AQ_CPPM_EN_LTRC   0x0800
+#define IAVF_AQ_CPPM_EN_DMCTH  0x1000
+#define IAVF_AQ_CPPM_EN_DMCTLX 0x2000
+#define IAVF_AQ_CPPM_EN_HPTC   0x4000
+#define IAVF_AQ_CPPM_EN_DMARC  0x8000
        __le16  ttlx;
        __le32  dmacr;
        __le16  dmcth;
@@ -485,47 +485,47 @@ struct avf_aqc_cppm_configuration {
        __le32  pfltrc;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_cppm_configuration);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_cppm_configuration);
 
 /* Set ARP Proxy command / response (indirect 0x0104) */
-struct avf_aqc_arp_proxy_data {
+struct iavf_aqc_arp_proxy_data {
        __le16  command_flags;
-#define AVF_AQ_ARP_INIT_IPV4   0x0800
-#define AVF_AQ_ARP_UNSUP_CTL   0x1000
-#define AVF_AQ_ARP_ENA         0x2000
-#define AVF_AQ_ARP_ADD_IPV4    0x4000
-#define AVF_AQ_ARP_DEL_IPV4    0x8000
+#define IAVF_AQ_ARP_INIT_IPV4  0x0800
+#define IAVF_AQ_ARP_UNSUP_CTL  0x1000
+#define IAVF_AQ_ARP_ENA                0x2000
+#define IAVF_AQ_ARP_ADD_IPV4   0x4000
+#define IAVF_AQ_ARP_DEL_IPV4   0x8000
        __le16  table_id;
        __le32  enabled_offloads;
-#define AVF_AQ_ARP_DIRECTED_OFFLOAD_ENABLE     0x00000020
-#define AVF_AQ_ARP_OFFLOAD_ENABLE              0x00000800
+#define IAVF_AQ_ARP_DIRECTED_OFFLOAD_ENABLE    0x00000020
+#define IAVF_AQ_ARP_OFFLOAD_ENABLE             0x00000800
        __le32  ip_addr;
        u8      mac_addr[6];
        u8      reserved[2];
 };
 
-AVF_CHECK_STRUCT_LEN(0x14, avf_aqc_arp_proxy_data);
+IAVF_CHECK_STRUCT_LEN(0x14, iavf_aqc_arp_proxy_data);
 
 /* Set NS Proxy Table Entry Command (indirect 0x0105) */
-struct avf_aqc_ns_proxy_data {
+struct iavf_aqc_ns_proxy_data {
        __le16  table_idx_mac_addr_0;
        __le16  table_idx_mac_addr_1;
        __le16  table_idx_ipv6_0;
        __le16  table_idx_ipv6_1;
        __le16  control;
-#define AVF_AQ_NS_PROXY_ADD_0          0x0001
-#define AVF_AQ_NS_PROXY_DEL_0          0x0002
-#define AVF_AQ_NS_PROXY_ADD_1          0x0004
-#define AVF_AQ_NS_PROXY_DEL_1          0x0008
-#define AVF_AQ_NS_PROXY_ADD_IPV6_0     0x0010
-#define AVF_AQ_NS_PROXY_DEL_IPV6_0     0x0020
-#define AVF_AQ_NS_PROXY_ADD_IPV6_1     0x0040
-#define AVF_AQ_NS_PROXY_DEL_IPV6_1     0x0080
-#define AVF_AQ_NS_PROXY_COMMAND_SEQ    0x0100
-#define AVF_AQ_NS_PROXY_INIT_IPV6_TBL  0x0200
-#define AVF_AQ_NS_PROXY_INIT_MAC_TBL   0x0400
-#define AVF_AQ_NS_PROXY_OFFLOAD_ENABLE 0x0800
-#define AVF_AQ_NS_PROXY_DIRECTED_OFFLOAD_ENABLE        0x1000
+#define IAVF_AQ_NS_PROXY_ADD_0         0x0001
+#define IAVF_AQ_NS_PROXY_DEL_0         0x0002
+#define IAVF_AQ_NS_PROXY_ADD_1         0x0004
+#define IAVF_AQ_NS_PROXY_DEL_1         0x0008
+#define IAVF_AQ_NS_PROXY_ADD_IPV6_0    0x0010
+#define IAVF_AQ_NS_PROXY_DEL_IPV6_0    0x0020
+#define IAVF_AQ_NS_PROXY_ADD_IPV6_1    0x0040
+#define IAVF_AQ_NS_PROXY_DEL_IPV6_1    0x0080
+#define IAVF_AQ_NS_PROXY_COMMAND_SEQ   0x0100
+#define IAVF_AQ_NS_PROXY_INIT_IPV6_TBL 0x0200
+#define IAVF_AQ_NS_PROXY_INIT_MAC_TBL  0x0400
+#define IAVF_AQ_NS_PROXY_OFFLOAD_ENABLE        0x0800
+#define IAVF_AQ_NS_PROXY_DIRECTED_OFFLOAD_ENABLE       0x1000
        u8      mac_addr_0[6];
        u8      mac_addr_1[6];
        u8      local_mac_addr[6];
@@ -533,247 +533,247 @@ struct avf_aqc_ns_proxy_data {
        u8      ipv6_addr_1[16];
 };
 
-AVF_CHECK_STRUCT_LEN(0x3c, avf_aqc_ns_proxy_data);
+IAVF_CHECK_STRUCT_LEN(0x3c, iavf_aqc_ns_proxy_data);
 
 /* Manage LAA Command (0x0106) - obsolete */
-struct avf_aqc_mng_laa {
+struct iavf_aqc_mng_laa {
        __le16  command_flags;
-#define AVF_AQ_LAA_FLAG_WR     0x8000
+#define IAVF_AQ_LAA_FLAG_WR    0x8000
        u8      reserved[2];
        __le32  sal;
        __le16  sah;
        u8      reserved2[6];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_mng_laa);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_mng_laa);
 
 /* Manage MAC Address Read Command (indirect 0x0107) */
-struct avf_aqc_mac_address_read {
+struct iavf_aqc_mac_address_read {
        __le16  command_flags;
-#define AVF_AQC_LAN_ADDR_VALID         0x10
-#define AVF_AQC_SAN_ADDR_VALID         0x20
-#define AVF_AQC_PORT_ADDR_VALID        0x40
-#define AVF_AQC_WOL_ADDR_VALID         0x80
-#define AVF_AQC_MC_MAG_EN_VALID        0x100
-#define AVF_AQC_WOL_PRESERVE_STATUS    0x200
-#define AVF_AQC_ADDR_VALID_MASK        0x3F0
+#define IAVF_AQC_LAN_ADDR_VALID                0x10
+#define IAVF_AQC_SAN_ADDR_VALID                0x20
+#define IAVF_AQC_PORT_ADDR_VALID       0x40
+#define IAVF_AQC_WOL_ADDR_VALID                0x80
+#define IAVF_AQC_MC_MAG_EN_VALID       0x100
+#define IAVF_AQC_WOL_PRESERVE_STATUS   0x200
+#define IAVF_AQC_ADDR_VALID_MASK       0x3F0
        u8      reserved[6];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_mac_address_read);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_mac_address_read);
 
-struct avf_aqc_mac_address_read_data {
+struct iavf_aqc_mac_address_read_data {
        u8 pf_lan_mac[6];
        u8 pf_san_mac[6];
        u8 port_mac[6];
        u8 pf_wol_mac[6];
 };
 
-AVF_CHECK_STRUCT_LEN(24, avf_aqc_mac_address_read_data);
+IAVF_CHECK_STRUCT_LEN(24, iavf_aqc_mac_address_read_data);
 
 /* Manage MAC Address Write Command (0x0108) */
-struct avf_aqc_mac_address_write {
+struct iavf_aqc_mac_address_write {
        __le16  command_flags;
-#define AVF_AQC_MC_MAG_EN              0x0100
-#define AVF_AQC_WOL_PRESERVE_ON_PFR    0x0200
-#define AVF_AQC_WRITE_TYPE_LAA_ONLY    0x0000
-#define AVF_AQC_WRITE_TYPE_LAA_WOL     0x4000
-#define AVF_AQC_WRITE_TYPE_PORT        0x8000
-#define AVF_AQC_WRITE_TYPE_UPDATE_MC_MAG       0xC000
-#define AVF_AQC_WRITE_TYPE_MASK        0xC000
+#define IAVF_AQC_MC_MAG_EN             0x0100
+#define IAVF_AQC_WOL_PRESERVE_ON_PFR   0x0200
+#define IAVF_AQC_WRITE_TYPE_LAA_ONLY   0x0000
+#define IAVF_AQC_WRITE_TYPE_LAA_WOL    0x4000
+#define IAVF_AQC_WRITE_TYPE_PORT       0x8000
+#define IAVF_AQC_WRITE_TYPE_UPDATE_MC_MAG      0xC000
+#define IAVF_AQC_WRITE_TYPE_MASK       0xC000
 
        __le16  mac_sah;
        __le32  mac_sal;
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_mac_address_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_mac_address_write);
 
 /* PXE commands (0x011x) */
 
 /* Clear PXE Command and response  (direct 0x0110) */
-struct avf_aqc_clear_pxe {
+struct iavf_aqc_clear_pxe {
        u8      rx_cnt;
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_clear_pxe);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_clear_pxe);
 
 /* Set WoL Filter (0x0120) */
 
-struct avf_aqc_set_wol_filter {
+struct iavf_aqc_set_wol_filter {
        __le16 filter_index;
-#define AVF_AQC_MAX_NUM_WOL_FILTERS    8
-#define AVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT        15
-#define AVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_MASK (0x1 << \
-               AVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT)
-
-#define AVF_AQC_SET_WOL_FILTER_INDEX_SHIFT             0
-#define AVF_AQC_SET_WOL_FILTER_INDEX_MASK      (0x7 << \
-               AVF_AQC_SET_WOL_FILTER_INDEX_SHIFT)
+#define IAVF_AQC_MAX_NUM_WOL_FILTERS   8
+#define IAVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT       15
+#define IAVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_MASK        (0x1 << \
+               IAVF_AQC_SET_WOL_FILTER_TYPE_MAGIC_SHIFT)
+
+#define IAVF_AQC_SET_WOL_FILTER_INDEX_SHIFT            0
+#define IAVF_AQC_SET_WOL_FILTER_INDEX_MASK     (0x7 << \
+               IAVF_AQC_SET_WOL_FILTER_INDEX_SHIFT)
        __le16 cmd_flags;
-#define AVF_AQC_SET_WOL_FILTER                         0x8000
-#define AVF_AQC_SET_WOL_FILTER_NO_TCO_WOL              0x4000
-#define AVF_AQC_SET_WOL_FILTER_WOL_PRESERVE_ON_PFR     0x2000
-#define AVF_AQC_SET_WOL_FILTER_ACTION_CLEAR            0
-#define AVF_AQC_SET_WOL_FILTER_ACTION_SET              1
+#define IAVF_AQC_SET_WOL_FILTER                                0x8000
+#define IAVF_AQC_SET_WOL_FILTER_NO_TCO_WOL             0x4000
+#define IAVF_AQC_SET_WOL_FILTER_WOL_PRESERVE_ON_PFR    0x2000
+#define IAVF_AQC_SET_WOL_FILTER_ACTION_CLEAR           0
+#define IAVF_AQC_SET_WOL_FILTER_ACTION_SET             1
        __le16 valid_flags;
-#define AVF_AQC_SET_WOL_FILTER_ACTION_VALID            0x8000
-#define AVF_AQC_SET_WOL_FILTER_NO_TCO_ACTION_VALID     0x4000
+#define IAVF_AQC_SET_WOL_FILTER_ACTION_VALID           0x8000
+#define IAVF_AQC_SET_WOL_FILTER_NO_TCO_ACTION_VALID    0x4000
        u8 reserved[2];
        __le32  address_high;
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_wol_filter);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_wol_filter);
 
-struct avf_aqc_set_wol_filter_data {
+struct iavf_aqc_set_wol_filter_data {
        u8 filter[128];
        u8 mask[16];
 };
 
-AVF_CHECK_STRUCT_LEN(0x90, avf_aqc_set_wol_filter_data);
+IAVF_CHECK_STRUCT_LEN(0x90, iavf_aqc_set_wol_filter_data);
 
 /* Get Wake Reason (0x0121) */
 
-struct avf_aqc_get_wake_reason_completion {
+struct iavf_aqc_get_wake_reason_completion {
        u8 reserved_1[2];
        __le16 wake_reason;
-#define AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT      0
-#define AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_MASK (0xFF << \
-               AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT)
-#define AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT   8
-#define AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_MASK    (0xFF << \
-               AVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT)
+#define IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT     0
+#define IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_MASK (0xFF << \
+               IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_MATCHED_INDEX_SHIFT)
+#define IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT  8
+#define IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_MASK   (0xFF << \
+               IAVF_AQC_GET_WAKE_UP_REASON_WOL_REASON_RESERVED_SHIFT)
        u8 reserved_2[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_wake_reason_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_wake_reason_completion);
 
 /* Switch configuration commands (0x02xx) */
 
 /* Used by many indirect commands that only pass an seid and a buffer in the
  * command
  */
-struct avf_aqc_switch_seid {
+struct iavf_aqc_switch_seid {
        __le16  seid;
        u8      reserved[6];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_switch_seid);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_switch_seid);
 
 /* Get Switch Configuration command (indirect 0x0200)
- * uses avf_aqc_switch_seid for the descriptor
+ * uses iavf_aqc_switch_seid for the descriptor
  */
-struct avf_aqc_get_switch_config_header_resp {
+struct iavf_aqc_get_switch_config_header_resp {
        __le16  num_reported;
        __le16  num_total;
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_switch_config_header_resp);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_switch_config_header_resp);
 
-struct avf_aqc_switch_config_element_resp {
+struct iavf_aqc_switch_config_element_resp {
        u8      element_type;
-#define AVF_AQ_SW_ELEM_TYPE_MAC        1
-#define AVF_AQ_SW_ELEM_TYPE_PF         2
-#define AVF_AQ_SW_ELEM_TYPE_VF         3
-#define AVF_AQ_SW_ELEM_TYPE_EMP        4
-#define AVF_AQ_SW_ELEM_TYPE_BMC        5
-#define AVF_AQ_SW_ELEM_TYPE_PV         16
-#define AVF_AQ_SW_ELEM_TYPE_VEB        17
-#define AVF_AQ_SW_ELEM_TYPE_PA         18
-#define AVF_AQ_SW_ELEM_TYPE_VSI        19
+#define IAVF_AQ_SW_ELEM_TYPE_MAC       1
+#define IAVF_AQ_SW_ELEM_TYPE_PF                2
+#define IAVF_AQ_SW_ELEM_TYPE_VF                3
+#define IAVF_AQ_SW_ELEM_TYPE_EMP       4
+#define IAVF_AQ_SW_ELEM_TYPE_BMC       5
+#define IAVF_AQ_SW_ELEM_TYPE_PV                16
+#define IAVF_AQ_SW_ELEM_TYPE_VEB       17
+#define IAVF_AQ_SW_ELEM_TYPE_PA                18
+#define IAVF_AQ_SW_ELEM_TYPE_VSI       19
        u8      revision;
-#define AVF_AQ_SW_ELEM_REV_1           1
+#define IAVF_AQ_SW_ELEM_REV_1          1
        __le16  seid;
        __le16  uplink_seid;
        __le16  downlink_seid;
        u8      reserved[3];
        u8      connection_type;
-#define AVF_AQ_CONN_TYPE_REGULAR       0x1
-#define AVF_AQ_CONN_TYPE_DEFAULT       0x2
-#define AVF_AQ_CONN_TYPE_CASCADED      0x3
+#define IAVF_AQ_CONN_TYPE_REGULAR      0x1
+#define IAVF_AQ_CONN_TYPE_DEFAULT      0x2
+#define IAVF_AQ_CONN_TYPE_CASCADED     0x3
        __le16  scheduler_id;
        __le16  element_info;
 };
 
-AVF_CHECK_STRUCT_LEN(0x10, avf_aqc_switch_config_element_resp);
+IAVF_CHECK_STRUCT_LEN(0x10, iavf_aqc_switch_config_element_resp);
 
 /* Get Switch Configuration (indirect 0x0200)
  *    an array of elements are returned in the response buffer
  *    the first in the array is the header, remainder are elements
  */
-struct avf_aqc_get_switch_config_resp {
-       struct avf_aqc_get_switch_config_header_resp    header;
-       struct avf_aqc_switch_config_element_resp       element[1];
+struct iavf_aqc_get_switch_config_resp {
+       struct iavf_aqc_get_switch_config_header_resp   header;
+       struct iavf_aqc_switch_config_element_resp      element[1];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_get_switch_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_get_switch_config_resp);
 
 /* Add Statistics (direct 0x0201)
  * Remove Statistics (direct 0x0202)
  */
-struct avf_aqc_add_remove_statistics {
+struct iavf_aqc_add_remove_statistics {
        __le16  seid;
        __le16  vlan;
        __le16  stat_index;
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_statistics);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_statistics);
 
 /* Set Port Parameters command (direct 0x0203) */
-struct avf_aqc_set_port_parameters {
+struct iavf_aqc_set_port_parameters {
        __le16  command_flags;
-#define AVF_AQ_SET_P_PARAMS_SAVE_BAD_PACKETS   1
-#define AVF_AQ_SET_P_PARAMS_PAD_SHORT_PACKETS  2 /* must set! */
-#define AVF_AQ_SET_P_PARAMS_DOUBLE_VLAN_ENA    4
+#define IAVF_AQ_SET_P_PARAMS_SAVE_BAD_PACKETS  1
+#define IAVF_AQ_SET_P_PARAMS_PAD_SHORT_PACKETS 2 /* must set! */
+#define IAVF_AQ_SET_P_PARAMS_DOUBLE_VLAN_ENA   4
        __le16  bad_frame_vsi;
-#define AVF_AQ_SET_P_PARAMS_BFRAME_SEID_SHIFT  0x0
-#define AVF_AQ_SET_P_PARAMS_BFRAME_SEID_MASK   0x3FF
+#define IAVF_AQ_SET_P_PARAMS_BFRAME_SEID_SHIFT 0x0
+#define IAVF_AQ_SET_P_PARAMS_BFRAME_SEID_MASK  0x3FF
        __le16  default_seid;        /* reserved for command */
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_port_parameters);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_port_parameters);
 
 /* Get Switch Resource Allocation (indirect 0x0204) */
-struct avf_aqc_get_switch_resource_alloc {
+struct iavf_aqc_get_switch_resource_alloc {
        u8      num_entries;         /* reserved for command */
        u8      reserved[7];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_switch_resource_alloc);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_switch_resource_alloc);
 
 /* expect an array of these structs in the response buffer */
-struct avf_aqc_switch_resource_alloc_element_resp {
+struct iavf_aqc_switch_resource_alloc_element_resp {
        u8      resource_type;
-#define AVF_AQ_RESOURCE_TYPE_VEB               0x0
-#define AVF_AQ_RESOURCE_TYPE_VSI               0x1
-#define AVF_AQ_RESOURCE_TYPE_MACADDR           0x2
-#define AVF_AQ_RESOURCE_TYPE_STAG              0x3
-#define AVF_AQ_RESOURCE_TYPE_ETAG              0x4
-#define AVF_AQ_RESOURCE_TYPE_MULTICAST_HASH    0x5
-#define AVF_AQ_RESOURCE_TYPE_UNICAST_HASH      0x6
-#define AVF_AQ_RESOURCE_TYPE_VLAN              0x7
-#define AVF_AQ_RESOURCE_TYPE_VSI_LIST_ENTRY    0x8
-#define AVF_AQ_RESOURCE_TYPE_ETAG_LIST_ENTRY   0x9
-#define AVF_AQ_RESOURCE_TYPE_VLAN_STAT_POOL    0xA
-#define AVF_AQ_RESOURCE_TYPE_MIRROR_RULE       0xB
-#define AVF_AQ_RESOURCE_TYPE_QUEUE_SETS        0xC
-#define AVF_AQ_RESOURCE_TYPE_VLAN_FILTERS      0xD
-#define AVF_AQ_RESOURCE_TYPE_INNER_MAC_FILTERS 0xF
-#define AVF_AQ_RESOURCE_TYPE_IP_FILTERS        0x10
-#define AVF_AQ_RESOURCE_TYPE_GRE_VN_KEYS       0x11
-#define AVF_AQ_RESOURCE_TYPE_VN2_KEYS          0x12
-#define AVF_AQ_RESOURCE_TYPE_TUNNEL_PORTS      0x13
+#define IAVF_AQ_RESOURCE_TYPE_VEB              0x0
+#define IAVF_AQ_RESOURCE_TYPE_VSI              0x1
+#define IAVF_AQ_RESOURCE_TYPE_MACADDR          0x2
+#define IAVF_AQ_RESOURCE_TYPE_STAG             0x3
+#define IAVF_AQ_RESOURCE_TYPE_ETAG             0x4
+#define IAVF_AQ_RESOURCE_TYPE_MULTICAST_HASH   0x5
+#define IAVF_AQ_RESOURCE_TYPE_UNICAST_HASH     0x6
+#define IAVF_AQ_RESOURCE_TYPE_VLAN             0x7
+#define IAVF_AQ_RESOURCE_TYPE_VSI_LIST_ENTRY   0x8
+#define IAVF_AQ_RESOURCE_TYPE_ETAG_LIST_ENTRY  0x9
+#define IAVF_AQ_RESOURCE_TYPE_VLAN_STAT_POOL   0xA
+#define IAVF_AQ_RESOURCE_TYPE_MIRROR_RULE      0xB
+#define IAVF_AQ_RESOURCE_TYPE_QUEUE_SETS       0xC
+#define IAVF_AQ_RESOURCE_TYPE_VLAN_FILTERS     0xD
+#define IAVF_AQ_RESOURCE_TYPE_INNER_MAC_FILTERS        0xF
+#define IAVF_AQ_RESOURCE_TYPE_IP_FILTERS       0x10
+#define IAVF_AQ_RESOURCE_TYPE_GRE_VN_KEYS      0x11
+#define IAVF_AQ_RESOURCE_TYPE_VN2_KEYS         0x12
+#define IAVF_AQ_RESOURCE_TYPE_TUNNEL_PORTS     0x13
        u8      reserved1;
        __le16  guaranteed;
        __le16  total;
@@ -782,15 +782,15 @@ struct avf_aqc_switch_resource_alloc_element_resp {
        u8      reserved2[6];
 };
 
-AVF_CHECK_STRUCT_LEN(0x10, avf_aqc_switch_resource_alloc_element_resp);
+IAVF_CHECK_STRUCT_LEN(0x10, iavf_aqc_switch_resource_alloc_element_resp);
 
 /* Set Switch Configuration (direct 0x0205) */
-struct avf_aqc_set_switch_config {
+struct iavf_aqc_set_switch_config {
        __le16  flags;
 /* flags used for both fields below */
-#define AVF_AQ_SET_SWITCH_CFG_PROMISC          0x0001
-#define AVF_AQ_SET_SWITCH_CFG_L2_FILTER        0x0002
-#define AVF_AQ_SET_SWITCH_CFG_HW_ATR_EVICT     0x0004
+#define IAVF_AQ_SET_SWITCH_CFG_PROMISC         0x0001
+#define IAVF_AQ_SET_SWITCH_CFG_L2_FILTER       0x0002
+#define IAVF_AQ_SET_SWITCH_CFG_HW_ATR_EVICT    0x0004
        __le16  valid_flags;
        /* The ethertype in switch_tag is dropped on ingress and used
         * internally by the switch. Set this to zero for the default
@@ -810,24 +810,24 @@ struct avf_aqc_set_switch_config {
        u8      reserved[6];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_switch_config);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_switch_config);
 
 /* Read Receive control registers  (direct 0x0206)
  * Write Receive control registers (direct 0x0207)
  *     used for accessing Rx control registers that can be
  *     slow and need special handling when under high Rx load
  */
-struct avf_aqc_rx_ctl_reg_read_write {
+struct iavf_aqc_rx_ctl_reg_read_write {
        __le32 reserved1;
        __le32 address;
        __le32 reserved2;
        __le32 value;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_rx_ctl_reg_read_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_rx_ctl_reg_read_write);
 
 /* Add VSI (indirect 0x0210)
- *    this indirect command uses struct avf_aqc_vsi_properties_data
+ *    this indirect command uses struct iavf_aqc_vsi_properties_data
  *    as the indirect buffer (128 bytes)
  *
  * Update VSI (indirect 0x211)
@@ -836,30 +836,30 @@ AVF_CHECK_CMD_LENGTH(avf_aqc_rx_ctl_reg_read_write);
  * Get VSI (indirect 0x0212)
  *     uses the same completion and data structure as Add VSI
  */
-struct avf_aqc_add_get_update_vsi {
+struct iavf_aqc_add_get_update_vsi {
        __le16  uplink_seid;
        u8      connection_type;
-#define AVF_AQ_VSI_CONN_TYPE_NORMAL    0x1
-#define AVF_AQ_VSI_CONN_TYPE_DEFAULT   0x2
-#define AVF_AQ_VSI_CONN_TYPE_CASCADED  0x3
+#define IAVF_AQ_VSI_CONN_TYPE_NORMAL   0x1
+#define IAVF_AQ_VSI_CONN_TYPE_DEFAULT  0x2
+#define IAVF_AQ_VSI_CONN_TYPE_CASCADED 0x3
        u8      reserved1;
        u8      vf_id;
        u8      reserved2;
        __le16  vsi_flags;
-#define AVF_AQ_VSI_TYPE_SHIFT          0x0
-#define AVF_AQ_VSI_TYPE_MASK           (0x3 << AVF_AQ_VSI_TYPE_SHIFT)
-#define AVF_AQ_VSI_TYPE_VF             0x0
-#define AVF_AQ_VSI_TYPE_VMDQ2          0x1
-#define AVF_AQ_VSI_TYPE_PF             0x2
-#define AVF_AQ_VSI_TYPE_EMP_MNG        0x3
-#define AVF_AQ_VSI_FLAG_CASCADED_PV    0x4
+#define IAVF_AQ_VSI_TYPE_SHIFT         0x0
+#define IAVF_AQ_VSI_TYPE_MASK          (0x3 << IAVF_AQ_VSI_TYPE_SHIFT)
+#define IAVF_AQ_VSI_TYPE_VF            0x0
+#define IAVF_AQ_VSI_TYPE_VMDQ2         0x1
+#define IAVF_AQ_VSI_TYPE_PF            0x2
+#define IAVF_AQ_VSI_TYPE_EMP_MNG       0x3
+#define IAVF_AQ_VSI_FLAG_CASCADED_PV   0x4
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_get_update_vsi);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_get_update_vsi);
 
-struct avf_aqc_add_get_update_vsi_completion {
+struct iavf_aqc_add_get_update_vsi_completion {
        __le16 seid;
        __le16 vsi_number;
        __le16 vsi_used;
@@ -868,116 +868,116 @@ struct avf_aqc_add_get_update_vsi_completion {
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_get_update_vsi_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_get_update_vsi_completion);
 
-struct avf_aqc_vsi_properties_data {
+struct iavf_aqc_vsi_properties_data {
        /* first 96 byte are written by SW */
        __le16  valid_sections;
-#define AVF_AQ_VSI_PROP_SWITCH_VALID           0x0001
-#define AVF_AQ_VSI_PROP_SECURITY_VALID         0x0002
-#define AVF_AQ_VSI_PROP_VLAN_VALID             0x0004
-#define AVF_AQ_VSI_PROP_CAS_PV_VALID           0x0008
-#define AVF_AQ_VSI_PROP_INGRESS_UP_VALID       0x0010
-#define AVF_AQ_VSI_PROP_EGRESS_UP_VALID        0x0020
-#define AVF_AQ_VSI_PROP_QUEUE_MAP_VALID        0x0040
-#define AVF_AQ_VSI_PROP_QUEUE_OPT_VALID        0x0080
-#define AVF_AQ_VSI_PROP_OUTER_UP_VALID         0x0100
-#define AVF_AQ_VSI_PROP_SCHED_VALID            0x0200
+#define IAVF_AQ_VSI_PROP_SWITCH_VALID          0x0001
+#define IAVF_AQ_VSI_PROP_SECURITY_VALID                0x0002
+#define IAVF_AQ_VSI_PROP_VLAN_VALID            0x0004
+#define IAVF_AQ_VSI_PROP_CAS_PV_VALID          0x0008
+#define IAVF_AQ_VSI_PROP_INGRESS_UP_VALID      0x0010
+#define IAVF_AQ_VSI_PROP_EGRESS_UP_VALID       0x0020
+#define IAVF_AQ_VSI_PROP_QUEUE_MAP_VALID       0x0040
+#define IAVF_AQ_VSI_PROP_QUEUE_OPT_VALID       0x0080
+#define IAVF_AQ_VSI_PROP_OUTER_UP_VALID                0x0100
+#define IAVF_AQ_VSI_PROP_SCHED_VALID           0x0200
        /* switch section */
        __le16  switch_id; /* 12bit id combined with flags below */
-#define AVF_AQ_VSI_SW_ID_SHIFT         0x0000
-#define AVF_AQ_VSI_SW_ID_MASK          (0xFFF << AVF_AQ_VSI_SW_ID_SHIFT)
-#define AVF_AQ_VSI_SW_ID_FLAG_NOT_STAG 0x1000
-#define AVF_AQ_VSI_SW_ID_FLAG_ALLOW_LB 0x2000
-#define AVF_AQ_VSI_SW_ID_FLAG_LOCAL_LB 0x4000
+#define IAVF_AQ_VSI_SW_ID_SHIFT                0x0000
+#define IAVF_AQ_VSI_SW_ID_MASK         (0xFFF << IAVF_AQ_VSI_SW_ID_SHIFT)
+#define IAVF_AQ_VSI_SW_ID_FLAG_NOT_STAG        0x1000
+#define IAVF_AQ_VSI_SW_ID_FLAG_ALLOW_LB        0x2000
+#define IAVF_AQ_VSI_SW_ID_FLAG_LOCAL_LB        0x4000
        u8      sw_reserved[2];
        /* security section */
        u8      sec_flags;
-#define AVF_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD    0x01
-#define AVF_AQ_VSI_SEC_FLAG_ENABLE_VLAN_CHK    0x02
-#define AVF_AQ_VSI_SEC_FLAG_ENABLE_MAC_CHK     0x04
+#define IAVF_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD   0x01
+#define IAVF_AQ_VSI_SEC_FLAG_ENABLE_VLAN_CHK   0x02
+#define IAVF_AQ_VSI_SEC_FLAG_ENABLE_MAC_CHK    0x04
        u8      sec_reserved;
        /* VLAN section */
        __le16  pvid; /* VLANS include priority bits */
        __le16  fcoe_pvid;
        u8      port_vlan_flags;
-#define AVF_AQ_VSI_PVLAN_MODE_SHIFT    0x00
-#define AVF_AQ_VSI_PVLAN_MODE_MASK     (0x03 << \
-                                        AVF_AQ_VSI_PVLAN_MODE_SHIFT)
-#define AVF_AQ_VSI_PVLAN_MODE_TAGGED   0x01
-#define AVF_AQ_VSI_PVLAN_MODE_UNTAGGED 0x02
-#define AVF_AQ_VSI_PVLAN_MODE_ALL      0x03
-#define AVF_AQ_VSI_PVLAN_INSERT_PVID   0x04
-#define AVF_AQ_VSI_PVLAN_EMOD_SHIFT    0x03
-#define AVF_AQ_VSI_PVLAN_EMOD_MASK     (0x3 << \
-                                        AVF_AQ_VSI_PVLAN_EMOD_SHIFT)
-#define AVF_AQ_VSI_PVLAN_EMOD_STR_BOTH 0x0
-#define AVF_AQ_VSI_PVLAN_EMOD_STR_UP   0x08
-#define AVF_AQ_VSI_PVLAN_EMOD_STR      0x10
-#define AVF_AQ_VSI_PVLAN_EMOD_NOTHING  0x18
+#define IAVF_AQ_VSI_PVLAN_MODE_SHIFT   0x00
+#define IAVF_AQ_VSI_PVLAN_MODE_MASK    (0x03 << \
+                                        IAVF_AQ_VSI_PVLAN_MODE_SHIFT)
+#define IAVF_AQ_VSI_PVLAN_MODE_TAGGED  0x01
+#define IAVF_AQ_VSI_PVLAN_MODE_UNTAGGED        0x02
+#define IAVF_AQ_VSI_PVLAN_MODE_ALL     0x03
+#define IAVF_AQ_VSI_PVLAN_INSERT_PVID  0x04
+#define IAVF_AQ_VSI_PVLAN_EMOD_SHIFT   0x03
+#define IAVF_AQ_VSI_PVLAN_EMOD_MASK    (0x3 << \
+                                        IAVF_AQ_VSI_PVLAN_EMOD_SHIFT)
+#define IAVF_AQ_VSI_PVLAN_EMOD_STR_BOTH        0x0
+#define IAVF_AQ_VSI_PVLAN_EMOD_STR_UP  0x08
+#define IAVF_AQ_VSI_PVLAN_EMOD_STR     0x10
+#define IAVF_AQ_VSI_PVLAN_EMOD_NOTHING 0x18
        u8      pvlan_reserved[3];
        /* ingress egress up sections */
        __le32  ingress_table; /* bitmap, 3 bits per up */
-#define AVF_AQ_VSI_UP_TABLE_UP0_SHIFT  0
-#define AVF_AQ_VSI_UP_TABLE_UP0_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP0_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP1_SHIFT  3
-#define AVF_AQ_VSI_UP_TABLE_UP1_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP1_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP2_SHIFT  6
-#define AVF_AQ_VSI_UP_TABLE_UP2_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP2_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP3_SHIFT  9
-#define AVF_AQ_VSI_UP_TABLE_UP3_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP3_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP4_SHIFT  12
-#define AVF_AQ_VSI_UP_TABLE_UP4_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP4_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP5_SHIFT  15
-#define AVF_AQ_VSI_UP_TABLE_UP5_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP5_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP6_SHIFT  18
-#define AVF_AQ_VSI_UP_TABLE_UP6_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP6_SHIFT)
-#define AVF_AQ_VSI_UP_TABLE_UP7_SHIFT  21
-#define AVF_AQ_VSI_UP_TABLE_UP7_MASK   (0x7 << \
-                                        AVF_AQ_VSI_UP_TABLE_UP7_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP0_SHIFT 0
+#define IAVF_AQ_VSI_UP_TABLE_UP0_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP0_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP1_SHIFT 3
+#define IAVF_AQ_VSI_UP_TABLE_UP1_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP1_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP2_SHIFT 6
+#define IAVF_AQ_VSI_UP_TABLE_UP2_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP2_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP3_SHIFT 9
+#define IAVF_AQ_VSI_UP_TABLE_UP3_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP3_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP4_SHIFT 12
+#define IAVF_AQ_VSI_UP_TABLE_UP4_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP4_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP5_SHIFT 15
+#define IAVF_AQ_VSI_UP_TABLE_UP5_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP5_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP6_SHIFT 18
+#define IAVF_AQ_VSI_UP_TABLE_UP6_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP6_SHIFT)
+#define IAVF_AQ_VSI_UP_TABLE_UP7_SHIFT 21
+#define IAVF_AQ_VSI_UP_TABLE_UP7_MASK  (0x7 << \
+                                        IAVF_AQ_VSI_UP_TABLE_UP7_SHIFT)
        __le32  egress_table;   /* same defines as for ingress table */
        /* cascaded PV section */
        __le16  cas_pv_tag;
        u8      cas_pv_flags;
-#define AVF_AQ_VSI_CAS_PV_TAGX_SHIFT           0x00
-#define AVF_AQ_VSI_CAS_PV_TAGX_MASK            (0x03 << \
-                                                AVF_AQ_VSI_CAS_PV_TAGX_SHIFT)
-#define AVF_AQ_VSI_CAS_PV_TAGX_LEAVE           0x00
-#define AVF_AQ_VSI_CAS_PV_TAGX_REMOVE          0x01
-#define AVF_AQ_VSI_CAS_PV_TAGX_COPY            0x02
-#define AVF_AQ_VSI_CAS_PV_INSERT_TAG           0x10
-#define AVF_AQ_VSI_CAS_PV_ETAG_PRUNE           0x20
-#define AVF_AQ_VSI_CAS_PV_ACCEPT_HOST_TAG      0x40
+#define IAVF_AQ_VSI_CAS_PV_TAGX_SHIFT          0x00
+#define IAVF_AQ_VSI_CAS_PV_TAGX_MASK           (0x03 << \
+                                                IAVF_AQ_VSI_CAS_PV_TAGX_SHIFT)
+#define IAVF_AQ_VSI_CAS_PV_TAGX_LEAVE          0x00
+#define IAVF_AQ_VSI_CAS_PV_TAGX_REMOVE         0x01
+#define IAVF_AQ_VSI_CAS_PV_TAGX_COPY           0x02
+#define IAVF_AQ_VSI_CAS_PV_INSERT_TAG          0x10
+#define IAVF_AQ_VSI_CAS_PV_ETAG_PRUNE          0x20
+#define IAVF_AQ_VSI_CAS_PV_ACCEPT_HOST_TAG     0x40
        u8      cas_pv_reserved;
        /* queue mapping section */
        __le16  mapping_flags;
-#define AVF_AQ_VSI_QUE_MAP_CONTIG      0x0
-#define AVF_AQ_VSI_QUE_MAP_NONCONTIG   0x1
+#define IAVF_AQ_VSI_QUE_MAP_CONTIG     0x0
+#define IAVF_AQ_VSI_QUE_MAP_NONCONTIG  0x1
        __le16  queue_mapping[16];
-#define AVF_AQ_VSI_QUEUE_SHIFT         0x0
-#define AVF_AQ_VSI_QUEUE_MASK          (0x7FF << AVF_AQ_VSI_QUEUE_SHIFT)
+#define IAVF_AQ_VSI_QUEUE_SHIFT                0x0
+#define IAVF_AQ_VSI_QUEUE_MASK         (0x7FF << IAVF_AQ_VSI_QUEUE_SHIFT)
        __le16  tc_mapping[8];
-#define AVF_AQ_VSI_TC_QUE_OFFSET_SHIFT 0
-#define AVF_AQ_VSI_TC_QUE_OFFSET_MASK  (0x1FF << \
-                                        AVF_AQ_VSI_TC_QUE_OFFSET_SHIFT)
-#define AVF_AQ_VSI_TC_QUE_NUMBER_SHIFT 9
-#define AVF_AQ_VSI_TC_QUE_NUMBER_MASK  (0x7 << \
-                                        AVF_AQ_VSI_TC_QUE_NUMBER_SHIFT)
+#define IAVF_AQ_VSI_TC_QUE_OFFSET_SHIFT        0
+#define IAVF_AQ_VSI_TC_QUE_OFFSET_MASK (0x1FF << \
+                                        IAVF_AQ_VSI_TC_QUE_OFFSET_SHIFT)
+#define IAVF_AQ_VSI_TC_QUE_NUMBER_SHIFT        9
+#define IAVF_AQ_VSI_TC_QUE_NUMBER_MASK (0x7 << \
+                                        IAVF_AQ_VSI_TC_QUE_NUMBER_SHIFT)
        /* queueing option section */
        u8      queueing_opt_flags;
-#define AVF_AQ_VSI_QUE_OPT_MULTICAST_UDP_ENA   0x04
-#define AVF_AQ_VSI_QUE_OPT_UNICAST_UDP_ENA     0x08
-#define AVF_AQ_VSI_QUE_OPT_TCP_ENA     0x10
-#define AVF_AQ_VSI_QUE_OPT_FCOE_ENA    0x20
-#define AVF_AQ_VSI_QUE_OPT_RSS_LUT_PF  0x00
-#define AVF_AQ_VSI_QUE_OPT_RSS_LUT_VSI 0x40
+#define IAVF_AQ_VSI_QUE_OPT_MULTICAST_UDP_ENA  0x04
+#define IAVF_AQ_VSI_QUE_OPT_UNICAST_UDP_ENA    0x08
+#define IAVF_AQ_VSI_QUE_OPT_TCP_ENA    0x10
+#define IAVF_AQ_VSI_QUE_OPT_FCOE_ENA   0x20
+#define IAVF_AQ_VSI_QUE_OPT_RSS_LUT_PF 0x00
+#define IAVF_AQ_VSI_QUE_OPT_RSS_LUT_VSI        0x40
        u8      queueing_opt_reserved[3];
        /* scheduler section */
        u8      up_enable_bits;
@@ -987,99 +987,99 @@ struct avf_aqc_vsi_properties_data {
        u8      cmd_reserved[8];
        /* last 32 bytes are written by FW */
        __le16  qs_handle[8];
-#define AVF_AQ_VSI_QS_HANDLE_INVALID   0xFFFF
+#define IAVF_AQ_VSI_QS_HANDLE_INVALID  0xFFFF
        __le16  stat_counter_idx;
        __le16  sched_id;
        u8      resp_reserved[12];
 };
 
-AVF_CHECK_STRUCT_LEN(128, avf_aqc_vsi_properties_data);
+IAVF_CHECK_STRUCT_LEN(128, iavf_aqc_vsi_properties_data);
 
 /* Add Port Virtualizer (direct 0x0220)
  * also used for update PV (direct 0x0221) but only flags are used
  * (IS_CTRL_PORT only works on add PV)
  */
-struct avf_aqc_add_update_pv {
+struct iavf_aqc_add_update_pv {
        __le16  command_flags;
-#define AVF_AQC_PV_FLAG_PV_TYPE                0x1
-#define AVF_AQC_PV_FLAG_FWD_UNKNOWN_STAG_EN    0x2
-#define AVF_AQC_PV_FLAG_FWD_UNKNOWN_ETAG_EN    0x4
-#define AVF_AQC_PV_FLAG_IS_CTRL_PORT           0x8
+#define IAVF_AQC_PV_FLAG_PV_TYPE               0x1
+#define IAVF_AQC_PV_FLAG_FWD_UNKNOWN_STAG_EN   0x2
+#define IAVF_AQC_PV_FLAG_FWD_UNKNOWN_ETAG_EN   0x4
+#define IAVF_AQC_PV_FLAG_IS_CTRL_PORT          0x8
        __le16  uplink_seid;
        __le16  connected_seid;
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_update_pv);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_update_pv);
 
-struct avf_aqc_add_update_pv_completion {
+struct iavf_aqc_add_update_pv_completion {
        /* reserved for update; for add also encodes error if rc == ENOSPC */
        __le16  pv_seid;
-#define AVF_AQC_PV_ERR_FLAG_NO_PV      0x1
-#define AVF_AQC_PV_ERR_FLAG_NO_SCHED   0x2
-#define AVF_AQC_PV_ERR_FLAG_NO_COUNTER 0x4
-#define AVF_AQC_PV_ERR_FLAG_NO_ENTRY   0x8
+#define IAVF_AQC_PV_ERR_FLAG_NO_PV     0x1
+#define IAVF_AQC_PV_ERR_FLAG_NO_SCHED  0x2
+#define IAVF_AQC_PV_ERR_FLAG_NO_COUNTER        0x4
+#define IAVF_AQC_PV_ERR_FLAG_NO_ENTRY  0x8
        u8      reserved[14];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_update_pv_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_update_pv_completion);
 
 /* Get PV Params (direct 0x0222)
- * uses avf_aqc_switch_seid for the descriptor
+ * uses iavf_aqc_switch_seid for the descriptor
  */
 
-struct avf_aqc_get_pv_params_completion {
+struct iavf_aqc_get_pv_params_completion {
        __le16  seid;
        __le16  default_stag;
        __le16  pv_flags; /* same flags as add_pv */
-#define AVF_AQC_GET_PV_PV_TYPE                 0x1
-#define AVF_AQC_GET_PV_FRWD_UNKNOWN_STAG       0x2
-#define AVF_AQC_GET_PV_FRWD_UNKNOWN_ETAG       0x4
+#define IAVF_AQC_GET_PV_PV_TYPE                        0x1
+#define IAVF_AQC_GET_PV_FRWD_UNKNOWN_STAG      0x2
+#define IAVF_AQC_GET_PV_FRWD_UNKNOWN_ETAG      0x4
        u8      reserved[8];
        __le16  default_port_seid;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_pv_params_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_pv_params_completion);
 
 /* Add VEB (direct 0x0230) */
-struct avf_aqc_add_veb {
+struct iavf_aqc_add_veb {
        __le16  uplink_seid;
        __le16  downlink_seid;
        __le16  veb_flags;
-#define AVF_AQC_ADD_VEB_FLOATING               0x1
-#define AVF_AQC_ADD_VEB_PORT_TYPE_SHIFT        1
-#define AVF_AQC_ADD_VEB_PORT_TYPE_MASK         (0x3 << \
-                                       AVF_AQC_ADD_VEB_PORT_TYPE_SHIFT)
-#define AVF_AQC_ADD_VEB_PORT_TYPE_DEFAULT      0x2
-#define AVF_AQC_ADD_VEB_PORT_TYPE_DATA         0x4
-#define AVF_AQC_ADD_VEB_ENABLE_L2_FILTER       0x8     /* deprecated */
-#define AVF_AQC_ADD_VEB_ENABLE_DISABLE_STATS   0x10
+#define IAVF_AQC_ADD_VEB_FLOATING              0x1
+#define IAVF_AQC_ADD_VEB_PORT_TYPE_SHIFT       1
+#define IAVF_AQC_ADD_VEB_PORT_TYPE_MASK                (0x3 << \
+                                       IAVF_AQC_ADD_VEB_PORT_TYPE_SHIFT)
+#define IAVF_AQC_ADD_VEB_PORT_TYPE_DEFAULT     0x2
+#define IAVF_AQC_ADD_VEB_PORT_TYPE_DATA                0x4
+#define IAVF_AQC_ADD_VEB_ENABLE_L2_FILTER      0x8     /* deprecated */
+#define IAVF_AQC_ADD_VEB_ENABLE_DISABLE_STATS  0x10
        u8      enable_tcs;
        u8      reserved[9];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_veb);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_veb);
 
-struct avf_aqc_add_veb_completion {
+struct iavf_aqc_add_veb_completion {
        u8      reserved[6];
        __le16  switch_seid;
        /* also encodes error if rc == ENOSPC; codes are the same as add_pv */
        __le16  veb_seid;
-#define AVF_AQC_VEB_ERR_FLAG_NO_VEB            0x1
-#define AVF_AQC_VEB_ERR_FLAG_NO_SCHED          0x2
-#define AVF_AQC_VEB_ERR_FLAG_NO_COUNTER        0x4
-#define AVF_AQC_VEB_ERR_FLAG_NO_ENTRY          0x8
+#define IAVF_AQC_VEB_ERR_FLAG_NO_VEB           0x1
+#define IAVF_AQC_VEB_ERR_FLAG_NO_SCHED         0x2
+#define IAVF_AQC_VEB_ERR_FLAG_NO_COUNTER       0x4
+#define IAVF_AQC_VEB_ERR_FLAG_NO_ENTRY         0x8
        __le16  statistic_index;
        __le16  vebs_used;
        __le16  vebs_free;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_veb_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_veb_completion);
 
 /* Get VEB Parameters (direct 0x0232)
- * uses avf_aqc_switch_seid for the descriptor
+ * uses iavf_aqc_switch_seid for the descriptor
  */
-struct avf_aqc_get_veb_parameters_completion {
+struct iavf_aqc_get_veb_parameters_completion {
        __le16  seid;
        __le16  switch_id;
        __le16  veb_flags; /* only the first/last flags from 0x0230 is valid */
@@ -1089,51 +1089,51 @@ struct avf_aqc_get_veb_parameters_completion {
        u8      reserved[4];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_veb_parameters_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_veb_parameters_completion);
 
 /* Delete Element (direct 0x0243)
- * uses the generic avf_aqc_switch_seid
+ * uses the generic iavf_aqc_switch_seid
  */
 
 /* Add MAC-VLAN (indirect 0x0250) */
 
 /* used for the command for most vlan commands */
-struct avf_aqc_macvlan {
+struct iavf_aqc_macvlan {
        __le16  num_addresses;
        __le16  seid[3];
-#define AVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT     0
-#define AVF_AQC_MACVLAN_CMD_SEID_NUM_MASK      (0x3FF << \
-                                       AVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
-#define AVF_AQC_MACVLAN_CMD_SEID_VALID         0x8000
+#define IAVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT    0
+#define IAVF_AQC_MACVLAN_CMD_SEID_NUM_MASK     (0x3FF << \
+                                       IAVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_MACVLAN_CMD_SEID_VALID                0x8000
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_macvlan);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_macvlan);
 
 /* indirect data for command and response */
-struct avf_aqc_add_macvlan_element_data {
+struct iavf_aqc_add_macvlan_element_data {
        u8      mac_addr[6];
        __le16  vlan_tag;
        __le16  flags;
-#define AVF_AQC_MACVLAN_ADD_PERFECT_MATCH      0x0001
-#define AVF_AQC_MACVLAN_ADD_HASH_MATCH         0x0002
-#define AVF_AQC_MACVLAN_ADD_IGNORE_VLAN        0x0004
-#define AVF_AQC_MACVLAN_ADD_TO_QUEUE           0x0008
-#define AVF_AQC_MACVLAN_ADD_USE_SHARED_MAC     0x0010
+#define IAVF_AQC_MACVLAN_ADD_PERFECT_MATCH     0x0001
+#define IAVF_AQC_MACVLAN_ADD_HASH_MATCH                0x0002
+#define IAVF_AQC_MACVLAN_ADD_IGNORE_VLAN       0x0004
+#define IAVF_AQC_MACVLAN_ADD_TO_QUEUE          0x0008
+#define IAVF_AQC_MACVLAN_ADD_USE_SHARED_MAC    0x0010
        __le16  queue_number;
-#define AVF_AQC_MACVLAN_CMD_QUEUE_SHIFT        0
-#define AVF_AQC_MACVLAN_CMD_QUEUE_MASK         (0x7FF << \
-                                       AVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_MACVLAN_CMD_QUEUE_SHIFT       0
+#define IAVF_AQC_MACVLAN_CMD_QUEUE_MASK                (0x7FF << \
+                                       IAVF_AQC_MACVLAN_CMD_SEID_NUM_SHIFT)
        /* response section */
        u8      match_method;
-#define AVF_AQC_MM_PERFECT_MATCH       0x01
-#define AVF_AQC_MM_HASH_MATCH          0x02
-#define AVF_AQC_MM_ERR_NO_RES          0xFF
+#define IAVF_AQC_MM_PERFECT_MATCH      0x01
+#define IAVF_AQC_MM_HASH_MATCH         0x02
+#define IAVF_AQC_MM_ERR_NO_RES         0xFF
        u8      reserved1[3];
 };
 
-struct avf_aqc_add_remove_macvlan_completion {
+struct iavf_aqc_add_remove_macvlan_completion {
        __le16 perfect_mac_used;
        __le16 perfect_mac_free;
        __le16 unicast_hash_free;
@@ -1142,64 +1142,64 @@ struct avf_aqc_add_remove_macvlan_completion {
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_macvlan_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_macvlan_completion);
 
 /* Remove MAC-VLAN (indirect 0x0251)
- * uses avf_aqc_macvlan for the descriptor
+ * uses iavf_aqc_macvlan for the descriptor
  * data points to an array of num_addresses of elements
  */
 
-struct avf_aqc_remove_macvlan_element_data {
+struct iavf_aqc_remove_macvlan_element_data {
        u8      mac_addr[6];
        __le16  vlan_tag;
        u8      flags;
-#define AVF_AQC_MACVLAN_DEL_PERFECT_MATCH      0x01
-#define AVF_AQC_MACVLAN_DEL_HASH_MATCH         0x02
-#define AVF_AQC_MACVLAN_DEL_IGNORE_VLAN        0x08
-#define AVF_AQC_MACVLAN_DEL_ALL_VSIS           0x10
+#define IAVF_AQC_MACVLAN_DEL_PERFECT_MATCH     0x01
+#define IAVF_AQC_MACVLAN_DEL_HASH_MATCH                0x02
+#define IAVF_AQC_MACVLAN_DEL_IGNORE_VLAN       0x08
+#define IAVF_AQC_MACVLAN_DEL_ALL_VSIS          0x10
        u8      reserved[3];
        /* reply section */
        u8      error_code;
-#define AVF_AQC_REMOVE_MACVLAN_SUCCESS         0x0
-#define AVF_AQC_REMOVE_MACVLAN_FAIL            0xFF
+#define IAVF_AQC_REMOVE_MACVLAN_SUCCESS                0x0
+#define IAVF_AQC_REMOVE_MACVLAN_FAIL           0xFF
        u8      reply_reserved[3];
 };
 
 /* Add VLAN (indirect 0x0252)
  * Remove VLAN (indirect 0x0253)
- * use the generic avf_aqc_macvlan for the command
+ * use the generic iavf_aqc_macvlan for the command
  */
-struct avf_aqc_add_remove_vlan_element_data {
+struct iavf_aqc_add_remove_vlan_element_data {
        __le16  vlan_tag;
        u8      vlan_flags;
 /* flags for add VLAN */
-#define AVF_AQC_ADD_VLAN_LOCAL                 0x1
-#define AVF_AQC_ADD_PVLAN_TYPE_SHIFT           1
-#define AVF_AQC_ADD_PVLAN_TYPE_MASK    (0x3 << AVF_AQC_ADD_PVLAN_TYPE_SHIFT)
-#define AVF_AQC_ADD_PVLAN_TYPE_REGULAR         0x0
-#define AVF_AQC_ADD_PVLAN_TYPE_PRIMARY         0x2
-#define AVF_AQC_ADD_PVLAN_TYPE_SECONDARY       0x4
-#define AVF_AQC_VLAN_PTYPE_SHIFT               3
-#define AVF_AQC_VLAN_PTYPE_MASK        (0x3 << AVF_AQC_VLAN_PTYPE_SHIFT)
-#define AVF_AQC_VLAN_PTYPE_REGULAR_VSI         0x0
-#define AVF_AQC_VLAN_PTYPE_PROMISC_VSI         0x8
-#define AVF_AQC_VLAN_PTYPE_COMMUNITY_VSI       0x10
-#define AVF_AQC_VLAN_PTYPE_ISOLATED_VSI        0x18
+#define IAVF_AQC_ADD_VLAN_LOCAL                        0x1
+#define IAVF_AQC_ADD_PVLAN_TYPE_SHIFT          1
+#define IAVF_AQC_ADD_PVLAN_TYPE_MASK   (0x3 << IAVF_AQC_ADD_PVLAN_TYPE_SHIFT)
+#define IAVF_AQC_ADD_PVLAN_TYPE_REGULAR                0x0
+#define IAVF_AQC_ADD_PVLAN_TYPE_PRIMARY                0x2
+#define IAVF_AQC_ADD_PVLAN_TYPE_SECONDARY      0x4
+#define IAVF_AQC_VLAN_PTYPE_SHIFT              3
+#define IAVF_AQC_VLAN_PTYPE_MASK       (0x3 << IAVF_AQC_VLAN_PTYPE_SHIFT)
+#define IAVF_AQC_VLAN_PTYPE_REGULAR_VSI                0x0
+#define IAVF_AQC_VLAN_PTYPE_PROMISC_VSI                0x8
+#define IAVF_AQC_VLAN_PTYPE_COMMUNITY_VSI      0x10
+#define IAVF_AQC_VLAN_PTYPE_ISOLATED_VSI       0x18
 /* flags for remove VLAN */
-#define AVF_AQC_REMOVE_VLAN_ALL        0x1
+#define IAVF_AQC_REMOVE_VLAN_ALL       0x1
        u8      reserved;
        u8      result;
 /* flags for add VLAN */
-#define AVF_AQC_ADD_VLAN_SUCCESS       0x0
-#define AVF_AQC_ADD_VLAN_FAIL_REQUEST  0xFE
-#define AVF_AQC_ADD_VLAN_FAIL_RESOURCE 0xFF
+#define IAVF_AQC_ADD_VLAN_SUCCESS      0x0
+#define IAVF_AQC_ADD_VLAN_FAIL_REQUEST 0xFE
+#define IAVF_AQC_ADD_VLAN_FAIL_RESOURCE        0xFF
 /* flags for remove VLAN */
-#define AVF_AQC_REMOVE_VLAN_SUCCESS    0x0
-#define AVF_AQC_REMOVE_VLAN_FAIL       0xFF
+#define IAVF_AQC_REMOVE_VLAN_SUCCESS   0x0
+#define IAVF_AQC_REMOVE_VLAN_FAIL      0xFF
        u8      reserved1[3];
 };
 
-struct avf_aqc_add_remove_vlan_completion {
+struct iavf_aqc_add_remove_vlan_completion {
        u8      reserved[4];
        __le16  vlans_used;
        __le16  vlans_free;
@@ -1208,70 +1208,70 @@ struct avf_aqc_add_remove_vlan_completion {
 };
 
 /* Set VSI Promiscuous Modes (direct 0x0254) */
-struct avf_aqc_set_vsi_promiscuous_modes {
+struct iavf_aqc_set_vsi_promiscuous_modes {
        __le16  promiscuous_flags;
        __le16  valid_flags;
 /* flags used for both fields above */
-#define AVF_AQC_SET_VSI_PROMISC_UNICAST        0x01
-#define AVF_AQC_SET_VSI_PROMISC_MULTICAST      0x02
-#define AVF_AQC_SET_VSI_PROMISC_BROADCAST      0x04
-#define AVF_AQC_SET_VSI_DEFAULT                0x08
-#define AVF_AQC_SET_VSI_PROMISC_VLAN           0x10
-#define AVF_AQC_SET_VSI_PROMISC_TX             0x8000
+#define IAVF_AQC_SET_VSI_PROMISC_UNICAST       0x01
+#define IAVF_AQC_SET_VSI_PROMISC_MULTICAST     0x02
+#define IAVF_AQC_SET_VSI_PROMISC_BROADCAST     0x04
+#define IAVF_AQC_SET_VSI_DEFAULT               0x08
+#define IAVF_AQC_SET_VSI_PROMISC_VLAN          0x10
+#define IAVF_AQC_SET_VSI_PROMISC_TX            0x8000
        __le16  seid;
-#define AVF_AQC_VSI_PROM_CMD_SEID_MASK         0x3FF
+#define IAVF_AQC_VSI_PROM_CMD_SEID_MASK                0x3FF
        __le16  vlan_tag;
-#define AVF_AQC_SET_VSI_VLAN_MASK              0x0FFF
-#define AVF_AQC_SET_VSI_VLAN_VALID             0x8000
+#define IAVF_AQC_SET_VSI_VLAN_MASK             0x0FFF
+#define IAVF_AQC_SET_VSI_VLAN_VALID            0x8000
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_vsi_promiscuous_modes);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_vsi_promiscuous_modes);
 
 /* Add S/E-tag command (direct 0x0255)
- * Uses generic avf_aqc_add_remove_tag_completion for completion
+ * Uses generic iavf_aqc_add_remove_tag_completion for completion
  */
-struct avf_aqc_add_tag {
+struct iavf_aqc_add_tag {
        __le16  flags;
-#define AVF_AQC_ADD_TAG_FLAG_TO_QUEUE          0x0001
+#define IAVF_AQC_ADD_TAG_FLAG_TO_QUEUE         0x0001
        __le16  seid;
-#define AVF_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT     0
-#define AVF_AQC_ADD_TAG_CMD_SEID_NUM_MASK      (0x3FF << \
-                                       AVF_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT    0
+#define IAVF_AQC_ADD_TAG_CMD_SEID_NUM_MASK     (0x3FF << \
+                                       IAVF_AQC_ADD_TAG_CMD_SEID_NUM_SHIFT)
        __le16  tag;
        __le16  queue_number;
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_tag);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_tag);
 
-struct avf_aqc_add_remove_tag_completion {
+struct iavf_aqc_add_remove_tag_completion {
        u8      reserved[12];
        __le16  tags_used;
        __le16  tags_free;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_tag_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_tag_completion);
 
 /* Remove S/E-tag command (direct 0x0256)
- * Uses generic avf_aqc_add_remove_tag_completion for completion
+ * Uses generic iavf_aqc_add_remove_tag_completion for completion
  */
-struct avf_aqc_remove_tag {
+struct iavf_aqc_remove_tag {
        __le16  seid;
-#define AVF_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT  0
-#define AVF_AQC_REMOVE_TAG_CMD_SEID_NUM_MASK   (0x3FF << \
-                                       AVF_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT 0
+#define IAVF_AQC_REMOVE_TAG_CMD_SEID_NUM_MASK  (0x3FF << \
+                                       IAVF_AQC_REMOVE_TAG_CMD_SEID_NUM_SHIFT)
        __le16  tag;
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_remove_tag);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_remove_tag);
 
 /* Add multicast E-Tag (direct 0x0257)
  * del multicast E-Tag (direct 0x0258) only uses pv_seid and etag fields
  * and no external data
  */
-struct avf_aqc_add_remove_mcast_etag {
+struct iavf_aqc_add_remove_mcast_etag {
        __le16  pv_seid;
        __le16  etag;
        u8      num_unicast_etags;
@@ -1280,9 +1280,9 @@ struct avf_aqc_add_remove_mcast_etag {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_mcast_etag);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_mcast_etag);
 
-struct avf_aqc_add_remove_mcast_etag_completion {
+struct iavf_aqc_add_remove_mcast_etag_completion {
        u8      reserved[4];
        __le16  mcast_etags_used;
        __le16  mcast_etags_free;
@@ -1291,54 +1291,54 @@ struct avf_aqc_add_remove_mcast_etag_completion {
 
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_mcast_etag_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_mcast_etag_completion);
 
 /* Update S/E-Tag (direct 0x0259) */
-struct avf_aqc_update_tag {
+struct iavf_aqc_update_tag {
        __le16  seid;
-#define AVF_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT  0
-#define AVF_AQC_UPDATE_TAG_CMD_SEID_NUM_MASK   (0x3FF << \
-                                       AVF_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT 0
+#define IAVF_AQC_UPDATE_TAG_CMD_SEID_NUM_MASK  (0x3FF << \
+                                       IAVF_AQC_UPDATE_TAG_CMD_SEID_NUM_SHIFT)
        __le16  old_tag;
        __le16  new_tag;
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_update_tag);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_update_tag);
 
-struct avf_aqc_update_tag_completion {
+struct iavf_aqc_update_tag_completion {
        u8      reserved[12];
        __le16  tags_used;
        __le16  tags_free;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_update_tag_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_update_tag_completion);
 
 /* Add Control Packet filter (direct 0x025A)
  * Remove Control Packet filter (direct 0x025B)
- * uses the avf_aqc_add_oveb_cloud,
+ * uses the iavf_aqc_add_oveb_cloud,
  * and the generic direct completion structure
  */
-struct avf_aqc_add_remove_control_packet_filter {
+struct iavf_aqc_add_remove_control_packet_filter {
        u8      mac[6];
        __le16  etype;
        __le16  flags;
-#define AVF_AQC_ADD_CONTROL_PACKET_FLAGS_IGNORE_MAC    0x0001
-#define AVF_AQC_ADD_CONTROL_PACKET_FLAGS_DROP          0x0002
-#define AVF_AQC_ADD_CONTROL_PACKET_FLAGS_TO_QUEUE      0x0004
-#define AVF_AQC_ADD_CONTROL_PACKET_FLAGS_TX            0x0008
-#define AVF_AQC_ADD_CONTROL_PACKET_FLAGS_RX            0x0000
+#define IAVF_AQC_ADD_CONTROL_PACKET_FLAGS_IGNORE_MAC   0x0001
+#define IAVF_AQC_ADD_CONTROL_PACKET_FLAGS_DROP         0x0002
+#define IAVF_AQC_ADD_CONTROL_PACKET_FLAGS_TO_QUEUE     0x0004
+#define IAVF_AQC_ADD_CONTROL_PACKET_FLAGS_TX           0x0008
+#define IAVF_AQC_ADD_CONTROL_PACKET_FLAGS_RX           0x0000
        __le16  seid;
-#define AVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT  0
-#define AVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_MASK   (0x3FF << \
-                               AVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT 0
+#define IAVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_MASK  (0x3FF << \
+                               IAVF_AQC_ADD_CONTROL_PACKET_CMD_SEID_NUM_SHIFT)
        __le16  queue;
        u8      reserved[2];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_control_packet_filter);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_control_packet_filter);
 
-struct avf_aqc_add_remove_control_packet_filter_completion {
+struct iavf_aqc_add_remove_control_packet_filter_completion {
        __le16  mac_etype_used;
        __le16  etype_used;
        __le16  mac_etype_free;
@@ -1346,30 +1346,30 @@ struct avf_aqc_add_remove_control_packet_filter_completion {
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_control_packet_filter_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_control_packet_filter_completion);
 
 /* Add Cloud filters (indirect 0x025C)
  * Remove Cloud filters (indirect 0x025D)
- * uses the avf_aqc_add_remove_cloud_filters,
+ * uses the iavf_aqc_add_remove_cloud_filters,
  * and the generic indirect completion structure
  */
-struct avf_aqc_add_remove_cloud_filters {
+struct iavf_aqc_add_remove_cloud_filters {
        u8      num_filters;
        u8      reserved;
        __le16  seid;
-#define AVF_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT   0
-#define AVF_AQC_ADD_CLOUD_CMD_SEID_NUM_MASK    (0x3FF << \
-                                       AVF_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT)
+#define IAVF_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT  0
+#define IAVF_AQC_ADD_CLOUD_CMD_SEID_NUM_MASK   (0x3FF << \
+                                       IAVF_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT)
        u8      big_buffer_flag;
-#define AVF_AQC_ADD_REM_CLOUD_CMD_BIG_BUFFER   1
+#define IAVF_AQC_ADD_REM_CLOUD_CMD_BIG_BUFFER  1
        u8      reserved2[3];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_remove_cloud_filters);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_remove_cloud_filters);
 
-struct avf_aqc_add_remove_cloud_filters_element_data {
+struct iavf_aqc_add_remove_cloud_filters_element_data {
        u8      outer_mac[6];
        u8      inner_mac[6];
        __le16  inner_vlan;
@@ -1383,97 +1383,97 @@ struct avf_aqc_add_remove_cloud_filters_element_data {
                } v6;
        } ipaddr;
        __le16  flags;
-#define AVF_AQC_ADD_CLOUD_FILTER_SHIFT                 0
-#define AVF_AQC_ADD_CLOUD_FILTER_MASK  (0x3F << \
-                                       AVF_AQC_ADD_CLOUD_FILTER_SHIFT)
+#define IAVF_AQC_ADD_CLOUD_FILTER_SHIFT                        0
+#define IAVF_AQC_ADD_CLOUD_FILTER_MASK (0x3F << \
+                                       IAVF_AQC_ADD_CLOUD_FILTER_SHIFT)
 /* 0x0000 reserved */
-#define AVF_AQC_ADD_CLOUD_FILTER_OIP                   0x0001
+#define IAVF_AQC_ADD_CLOUD_FILTER_OIP                  0x0001
 /* 0x0002 reserved */
-#define AVF_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN            0x0003
-#define AVF_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_TEN_ID     0x0004
+#define IAVF_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN           0x0003
+#define IAVF_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_TEN_ID    0x0004
 /* 0x0005 reserved */
-#define AVF_AQC_ADD_CLOUD_FILTER_IMAC_TEN_ID           0x0006
+#define IAVF_AQC_ADD_CLOUD_FILTER_IMAC_TEN_ID          0x0006
 /* 0x0007 reserved */
 /* 0x0008 reserved */
-#define AVF_AQC_ADD_CLOUD_FILTER_OMAC                  0x0009
-#define AVF_AQC_ADD_CLOUD_FILTER_IMAC                  0x000A
-#define AVF_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC      0x000B
-#define AVF_AQC_ADD_CLOUD_FILTER_IIP                   0x000C
+#define IAVF_AQC_ADD_CLOUD_FILTER_OMAC                 0x0009
+#define IAVF_AQC_ADD_CLOUD_FILTER_IMAC                 0x000A
+#define IAVF_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC     0x000B
+#define IAVF_AQC_ADD_CLOUD_FILTER_IIP                  0x000C
 /* 0x0010 to 0x0017 is for custom filters */
 
-#define AVF_AQC_ADD_CLOUD_FLAGS_TO_QUEUE               0x0080
-#define AVF_AQC_ADD_CLOUD_VNK_SHIFT                    6
-#define AVF_AQC_ADD_CLOUD_VNK_MASK                     0x00C0
-#define AVF_AQC_ADD_CLOUD_FLAGS_IPV4                   0
-#define AVF_AQC_ADD_CLOUD_FLAGS_IPV6                   0x0100
-
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_SHIFT               9
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_MASK                0x1E00
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_VXLAN               0
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC          1
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_GENEVE              2
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_IP                  3
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_RESERVED            4
-#define AVF_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE           5
-
-#define AVF_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_MAC       0x2000
-#define AVF_AQC_ADD_CLOUD_FLAGS_SHARED_INNER_MAC       0x4000
-#define AVF_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_IP        0x8000
+#define IAVF_AQC_ADD_CLOUD_FLAGS_TO_QUEUE              0x0080
+#define IAVF_AQC_ADD_CLOUD_VNK_SHIFT                   6
+#define IAVF_AQC_ADD_CLOUD_VNK_MASK                    0x00C0
+#define IAVF_AQC_ADD_CLOUD_FLAGS_IPV4                  0
+#define IAVF_AQC_ADD_CLOUD_FLAGS_IPV6                  0x0100
+
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_SHIFT              9
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_MASK               0x1E00
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_VXLAN              0
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC         1
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_GENEVE             2
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_IP                 3
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_RESERVED           4
+#define IAVF_AQC_ADD_CLOUD_TNL_TYPE_VXLAN_GPE          5
+
+#define IAVF_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_MAC      0x2000
+#define IAVF_AQC_ADD_CLOUD_FLAGS_SHARED_INNER_MAC      0x4000
+#define IAVF_AQC_ADD_CLOUD_FLAGS_SHARED_OUTER_IP       0x8000
 
        __le32  tenant_id;
        u8      reserved[4];
        __le16  queue_number;
-#define AVF_AQC_ADD_CLOUD_QUEUE_SHIFT          0
-#define AVF_AQC_ADD_CLOUD_QUEUE_MASK           (0x7FF << \
-                                                AVF_AQC_ADD_CLOUD_QUEUE_SHIFT)
+#define IAVF_AQC_ADD_CLOUD_QUEUE_SHIFT         0
+#define IAVF_AQC_ADD_CLOUD_QUEUE_MASK          (0x7FF << \
+                                                IAVF_AQC_ADD_CLOUD_QUEUE_SHIFT)
        u8      reserved2[14];
        /* response section */
        u8      allocation_result;
-#define AVF_AQC_ADD_CLOUD_FILTER_SUCCESS       0x0
-#define AVF_AQC_ADD_CLOUD_FILTER_FAIL          0xFF
+#define IAVF_AQC_ADD_CLOUD_FILTER_SUCCESS      0x0
+#define IAVF_AQC_ADD_CLOUD_FILTER_FAIL         0xFF
        u8      response_reserved[7];
 };
 
-/* avf_aqc_add_rm_cloud_filt_elem_ext is used when
- * AVF_AQC_ADD_REM_CLOUD_CMD_BIG_BUFFER flag is set.
+/* iavf_aqc_add_rm_cloud_filt_elem_ext is used when
+ * IAVF_AQC_ADD_REM_CLOUD_CMD_BIG_BUFFER flag is set.
  */
-struct avf_aqc_add_rm_cloud_filt_elem_ext {
-       struct avf_aqc_add_remove_cloud_filters_element_data element;
+struct iavf_aqc_add_rm_cloud_filt_elem_ext {
+       struct iavf_aqc_add_remove_cloud_filters_element_data element;
        u16     general_fields[32];
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0    0
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1    1
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2    2
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0    3
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1    4
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2    5
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0    6
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1    7
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2    8
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0    9
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1    10
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2    11
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD0    12
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD1    13
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD2    14
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0    15
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD1    16
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD2    17
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD3    18
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD4    19
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD5    20
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD6    21
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD7    22
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD0    23
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD1    24
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD2    25
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD3    26
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD4    27
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD5    28
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD6    29
-#define AVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD7    30
-};
-
-struct avf_aqc_remove_cloud_filters_completion {
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0   0
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1   1
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2   2
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0   3
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1   4
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2   5
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0   6
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1   7
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2   8
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0   9
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1   10
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2   11
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD0   12
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD1   13
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X14_WORD2   14
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0   15
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD1   16
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD2   17
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD3   18
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD4   19
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD5   20
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD6   21
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X16_WORD7   22
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD0   23
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD1   24
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD2   25
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD3   26
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD4   27
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD5   28
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD6   29
+#define IAVF_AQC_ADD_CLOUD_FV_FLU_0X17_WORD7   30
+};
+
+struct iavf_aqc_remove_cloud_filters_completion {
        __le16 perfect_ovlan_used;
        __le16 perfect_ovlan_free;
        __le16 vlan_used;
@@ -1482,24 +1482,24 @@ struct avf_aqc_remove_cloud_filters_completion {
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_remove_cloud_filters_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_remove_cloud_filters_completion);
 
 /* Replace filter Command 0x025F
- * uses the avf_aqc_replace_cloud_filters,
+ * uses the iavf_aqc_replace_cloud_filters,
  * and the generic indirect completion structure
  */
-struct avf_filter_data {
+struct iavf_filter_data {
        u8 filter_type;
        u8 input[3];
 };
 
-struct avf_aqc_replace_cloud_filters_cmd {
+struct iavf_aqc_replace_cloud_filters_cmd {
        u8      valid_flags;
-#define AVF_AQC_REPLACE_L1_FILTER              0x0
-#define AVF_AQC_REPLACE_CLOUD_FILTER           0x1
-#define AVF_AQC_GET_CLOUD_FILTERS              0x2
-#define AVF_AQC_MIRROR_CLOUD_FILTER            0x4
-#define AVF_AQC_HIGH_PRIORITY_CLOUD_FILTER     0x8
+#define IAVF_AQC_REPLACE_L1_FILTER             0x0
+#define IAVF_AQC_REPLACE_CLOUD_FILTER          0x1
+#define IAVF_AQC_GET_CLOUD_FILTERS             0x2
+#define IAVF_AQC_MIRROR_CLOUD_FILTER           0x4
+#define IAVF_AQC_HIGH_PRIORITY_CLOUD_FILTER    0x8
        u8      old_filter_type;
        u8      new_filter_type;
        u8      tr_bit;
@@ -1508,28 +1508,28 @@ struct avf_aqc_replace_cloud_filters_cmd {
        __le32 addr_low;
 };
 
-struct avf_aqc_replace_cloud_filters_cmd_buf {
+struct iavf_aqc_replace_cloud_filters_cmd_buf {
        u8      data[32];
 /* Filter type INPUT codes*/
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_ENTRIES_MAX    3
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_VALIDATED      (1 << 7UL)
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_ENTRIES_MAX   3
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_VALIDATED     (1 << 7UL)
 
 /* Field Vector offsets */
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_MAC_DA              0
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_ETH            6
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG                7
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_VLAN                8
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_OVLAN          9
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_IVLAN          10
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_TUNNLE_KEY          11
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC                12
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_MAC_DA             0
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_ETH           6
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG               7
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_VLAN               8
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_OVLAN         9
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_IVLAN         10
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_TUNNLE_KEY         11
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC               12
 /* big FLU */
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IP_DA               14
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IP_DA              14
 /* big FLU */
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_OIP_DA              15
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_OIP_DA             15
 
-#define AVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_INNER_VLAN          37
-       struct avf_filter_data  filters[8];
+#define IAVF_AQC_REPLACE_CLOUD_CMD_INPUT_FV_INNER_VLAN         37
+       struct iavf_filter_data filters[8];
 };
 
 /* Add Mirror Rule (indirect or direct 0x0260)
@@ -1537,26 +1537,26 @@ struct avf_aqc_replace_cloud_filters_cmd_buf {
  * note: some rule types (4,5) do not use an external buffer.
  *       take care to set the flags correctly.
  */
-struct avf_aqc_add_delete_mirror_rule {
+struct iavf_aqc_add_delete_mirror_rule {
        __le16 seid;
        __le16 rule_type;
-#define AVF_AQC_MIRROR_RULE_TYPE_SHIFT         0
-#define AVF_AQC_MIRROR_RULE_TYPE_MASK          (0x7 << \
-                                               AVF_AQC_MIRROR_RULE_TYPE_SHIFT)
-#define AVF_AQC_MIRROR_RULE_TYPE_VPORT_INGRESS 1
-#define AVF_AQC_MIRROR_RULE_TYPE_VPORT_EGRESS  2
-#define AVF_AQC_MIRROR_RULE_TYPE_VLAN          3
-#define AVF_AQC_MIRROR_RULE_TYPE_ALL_INGRESS   4
-#define AVF_AQC_MIRROR_RULE_TYPE_ALL_EGRESS    5
+#define IAVF_AQC_MIRROR_RULE_TYPE_SHIFT                0
+#define IAVF_AQC_MIRROR_RULE_TYPE_MASK         (0x7 << \
+                                               IAVF_AQC_MIRROR_RULE_TYPE_SHIFT)
+#define IAVF_AQC_MIRROR_RULE_TYPE_VPORT_INGRESS        1
+#define IAVF_AQC_MIRROR_RULE_TYPE_VPORT_EGRESS 2
+#define IAVF_AQC_MIRROR_RULE_TYPE_VLAN         3
+#define IAVF_AQC_MIRROR_RULE_TYPE_ALL_INGRESS  4
+#define IAVF_AQC_MIRROR_RULE_TYPE_ALL_EGRESS   5
        __le16 num_entries;
        __le16 destination;  /* VSI for add, rule id for delete */
        __le32 addr_high;    /* address of array of 2-byte VSI or VLAN ids */
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_delete_mirror_rule);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_delete_mirror_rule);
 
-struct avf_aqc_add_delete_mirror_rule_completion {
+struct iavf_aqc_add_delete_mirror_rule_completion {
        u8      reserved[2];
        __le16  rule_id;  /* only used on add */
        __le16  mirror_rules_used;
@@ -1565,10 +1565,10 @@ struct avf_aqc_add_delete_mirror_rule_completion {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_delete_mirror_rule_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_delete_mirror_rule_completion);
 
 /* Dynamic Device Personalization */
-struct avf_aqc_write_personalization_profile {
+struct iavf_aqc_write_personalization_profile {
        u8      flags;
        u8      reserved[3];
        __le32  profile_track_id;
@@ -1576,43 +1576,43 @@ struct avf_aqc_write_personalization_profile {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_write_personalization_profile);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_write_personalization_profile);
 
-struct avf_aqc_write_ddp_resp {
+struct iavf_aqc_write_ddp_resp {
        __le32 error_offset;
        __le32 error_info;
        __le32 addr_high;
        __le32 addr_low;
 };
 
-struct avf_aqc_get_applied_profiles {
+struct iavf_aqc_get_applied_profiles {
        u8      flags;
-#define AVF_AQC_GET_DDP_GET_CONF       0x1
-#define AVF_AQC_GET_DDP_GET_RDPU_CONF  0x2
+#define IAVF_AQC_GET_DDP_GET_CONF      0x1
+#define IAVF_AQC_GET_DDP_GET_RDPU_CONF 0x2
        u8      rsv[3];
        __le32  reserved;
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_applied_profiles);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_applied_profiles);
 
 /* DCB 0x03xx*/
 
 /* PFC Ignore (direct 0x0301)
  *    the command and response use the same descriptor structure
  */
-struct avf_aqc_pfc_ignore {
+struct iavf_aqc_pfc_ignore {
        u8      tc_bitmap;
        u8      command_flags; /* unused on response */
-#define AVF_AQC_PFC_IGNORE_SET         0x80
-#define AVF_AQC_PFC_IGNORE_CLEAR       0x0
+#define IAVF_AQC_PFC_IGNORE_SET                0x80
+#define IAVF_AQC_PFC_IGNORE_CLEAR      0x0
        u8      reserved[14];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_pfc_ignore);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_pfc_ignore);
 
-/* DCB Update (direct 0x0302) uses the avf_aq_desc structure
+/* DCB Update (direct 0x0302) uses the iavf_aq_desc structure
  * with no parameters
  */
 
@@ -1621,22 +1621,22 @@ AVF_CHECK_CMD_LENGTH(avf_aqc_pfc_ignore);
 /* Almost all the indirect commands use
  * this generic struct to pass the SEID in param0
  */
-struct avf_aqc_tx_sched_ind {
+struct iavf_aqc_tx_sched_ind {
        __le16  vsi_seid;
        u8      reserved[6];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_tx_sched_ind);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_tx_sched_ind);
 
 /* Several commands respond with a set of queue set handles */
-struct avf_aqc_qs_handles_resp {
+struct iavf_aqc_qs_handles_resp {
        __le16 qs_handles[8];
 };
 
 /* Configure VSI BW limits (direct 0x0400) */
-struct avf_aqc_configure_vsi_bw_limit {
+struct iavf_aqc_configure_vsi_bw_limit {
        __le16  vsi_seid;
        u8      reserved[2];
        __le16  credit;
@@ -1645,12 +1645,12 @@ struct avf_aqc_configure_vsi_bw_limit {
        u8      reserved2[7];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_configure_vsi_bw_limit);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_configure_vsi_bw_limit);
 
 /* Configure VSI Bandwidth Limit per Traffic Type (indirect 0x0406)
- *    responds with avf_aqc_qs_handles_resp
+ *    responds with iavf_aqc_qs_handles_resp
  */
-struct avf_aqc_configure_vsi_ets_sla_bw_data {
+struct iavf_aqc_configure_vsi_ets_sla_bw_data {
        u8      tc_valid_bits;
        u8      reserved[15];
        __le16  tc_bw_credits[8]; /* FW writesback QS handles here */
@@ -1660,12 +1660,12 @@ struct avf_aqc_configure_vsi_ets_sla_bw_data {
        u8      reserved1[28];
 };
 
-AVF_CHECK_STRUCT_LEN(0x40, avf_aqc_configure_vsi_ets_sla_bw_data);
+IAVF_CHECK_STRUCT_LEN(0x40, iavf_aqc_configure_vsi_ets_sla_bw_data);
 
 /* Configure VSI Bandwidth Allocation per Traffic Type (indirect 0x0407)
- *    responds with avf_aqc_qs_handles_resp
+ *    responds with iavf_aqc_qs_handles_resp
  */
-struct avf_aqc_configure_vsi_tc_bw_data {
+struct iavf_aqc_configure_vsi_tc_bw_data {
        u8      tc_valid_bits;
        u8      reserved[3];
        u8      tc_bw_credits[8];
@@ -1673,10 +1673,10 @@ struct avf_aqc_configure_vsi_tc_bw_data {
        __le16  qs_handles[8];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_configure_vsi_tc_bw_data);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_configure_vsi_tc_bw_data);
 
 /* Query vsi bw configuration (indirect 0x0408) */
-struct avf_aqc_query_vsi_bw_config_resp {
+struct iavf_aqc_query_vsi_bw_config_resp {
        u8      tc_valid_bits;
        u8      tc_suspended_bits;
        u8      reserved[14];
@@ -1688,10 +1688,10 @@ struct avf_aqc_query_vsi_bw_config_resp {
        u8      reserved3[23];
 };
 
-AVF_CHECK_STRUCT_LEN(0x40, avf_aqc_query_vsi_bw_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x40, iavf_aqc_query_vsi_bw_config_resp);
 
 /* Query VSI Bandwidth Allocation per Traffic Type (indirect 0x040A) */
-struct avf_aqc_query_vsi_ets_sla_config_resp {
+struct iavf_aqc_query_vsi_ets_sla_config_resp {
        u8      tc_valid_bits;
        u8      reserved[3];
        u8      share_credits[8];
@@ -1701,10 +1701,10 @@ struct avf_aqc_query_vsi_ets_sla_config_resp {
        __le16  tc_bw_max[2];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_query_vsi_ets_sla_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_query_vsi_ets_sla_config_resp);
 
 /* Configure Switching Component Bandwidth Limit (direct 0x0410) */
-struct avf_aqc_configure_switching_comp_bw_limit {
+struct iavf_aqc_configure_switching_comp_bw_limit {
        __le16  seid;
        u8      reserved[2];
        __le16  credit;
@@ -1713,27 +1713,27 @@ struct avf_aqc_configure_switching_comp_bw_limit {
        u8      reserved2[7];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_configure_switching_comp_bw_limit);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_configure_switching_comp_bw_limit);
 
 /* Enable  Physical Port ETS (indirect 0x0413)
  * Modify  Physical Port ETS (indirect 0x0414)
  * Disable Physical Port ETS (indirect 0x0415)
  */
-struct avf_aqc_configure_switching_comp_ets_data {
+struct iavf_aqc_configure_switching_comp_ets_data {
        u8      reserved[4];
        u8      tc_valid_bits;
        u8      seepage;
-#define AVF_AQ_ETS_SEEPAGE_EN_MASK     0x1
+#define IAVF_AQ_ETS_SEEPAGE_EN_MASK    0x1
        u8      tc_strict_priority_flags;
        u8      reserved1[17];
        u8      tc_bw_share_credits[8];
        u8      reserved2[96];
 };
 
-AVF_CHECK_STRUCT_LEN(0x80, avf_aqc_configure_switching_comp_ets_data);
+IAVF_CHECK_STRUCT_LEN(0x80, iavf_aqc_configure_switching_comp_ets_data);
 
 /* Configure Switching Component Bandwidth Limits per Tc (indirect 0x0416) */
-struct avf_aqc_configure_switching_comp_ets_bw_limit_data {
+struct iavf_aqc_configure_switching_comp_ets_bw_limit_data {
        u8      tc_valid_bits;
        u8      reserved[15];
        __le16  tc_bw_credit[8];
@@ -1743,13 +1743,13 @@ struct avf_aqc_configure_switching_comp_ets_bw_limit_data {
        u8      reserved1[28];
 };
 
-AVF_CHECK_STRUCT_LEN(0x40,
-                     avf_aqc_configure_switching_comp_ets_bw_limit_data);
+IAVF_CHECK_STRUCT_LEN(0x40,
+                     iavf_aqc_configure_switching_comp_ets_bw_limit_data);
 
 /* Configure Switching Component Bandwidth Allocation per Tc
  * (indirect 0x0417)
  */
-struct avf_aqc_configure_switching_comp_bw_config_data {
+struct iavf_aqc_configure_switching_comp_bw_config_data {
        u8      tc_valid_bits;
        u8      reserved[2];
        u8      absolute_credits; /* bool */
@@ -1757,10 +1757,10 @@ struct avf_aqc_configure_switching_comp_bw_config_data {
        u8      reserved1[20];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_configure_switching_comp_bw_config_data);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_configure_switching_comp_bw_config_data);
 
 /* Query Switching Component Configuration (indirect 0x0418) */
-struct avf_aqc_query_switching_comp_ets_config_resp {
+struct iavf_aqc_query_switching_comp_ets_config_resp {
        u8      tc_valid_bits;
        u8      reserved[35];
        __le16  port_bw_limit;
@@ -1769,10 +1769,10 @@ struct avf_aqc_query_switching_comp_ets_config_resp {
        u8      reserved2[23];
 };
 
-AVF_CHECK_STRUCT_LEN(0x40, avf_aqc_query_switching_comp_ets_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x40, iavf_aqc_query_switching_comp_ets_config_resp);
 
 /* Query PhysicalPort ETS Configuration (indirect 0x0419) */
-struct avf_aqc_query_port_ets_config_resp {
+struct iavf_aqc_query_port_ets_config_resp {
        u8      reserved[4];
        u8      tc_valid_bits;
        u8      reserved1;
@@ -1786,12 +1786,12 @@ struct avf_aqc_query_port_ets_config_resp {
        u8      reserved3[32];
 };
 
-AVF_CHECK_STRUCT_LEN(0x44, avf_aqc_query_port_ets_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x44, iavf_aqc_query_port_ets_config_resp);
 
 /* Query Switching Component Bandwidth Allocation per Traffic Type
  * (indirect 0x041A)
  */
-struct avf_aqc_query_switching_comp_bw_config_resp {
+struct iavf_aqc_query_switching_comp_bw_config_resp {
        u8      tc_valid_bits;
        u8      reserved[2];
        u8      absolute_credits_enable; /* bool */
@@ -1802,7 +1802,7 @@ struct avf_aqc_query_switching_comp_bw_config_resp {
        __le16  tc_bw_max[2];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_query_switching_comp_bw_config_resp);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_query_switching_comp_bw_config_resp);
 
 /* Suspend/resume port TX traffic
  * (direct 0x041B and 0x041C) uses the generic SEID struct
@@ -1811,99 +1811,99 @@ AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_query_switching_comp_bw_config_resp);
 /* Configure partition BW
  * (indirect 0x041D)
  */
-struct avf_aqc_configure_partition_bw_data {
+struct iavf_aqc_configure_partition_bw_data {
        __le16  pf_valid_bits;
        u8      min_bw[16];      /* guaranteed bandwidth */
        u8      max_bw[16];      /* bandwidth limit */
 };
 
-AVF_CHECK_STRUCT_LEN(0x22, avf_aqc_configure_partition_bw_data);
+IAVF_CHECK_STRUCT_LEN(0x22, iavf_aqc_configure_partition_bw_data);
 
 /* Get and set the active HMC resource profile and status.
  * (direct 0x0500) and (direct 0x0501)
  */
-struct avf_aq_get_set_hmc_resource_profile {
+struct iavf_aq_get_set_hmc_resource_profile {
        u8      pm_profile;
        u8      pe_vf_enabled;
        u8      reserved[14];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aq_get_set_hmc_resource_profile);
+IAVF_CHECK_CMD_LENGTH(iavf_aq_get_set_hmc_resource_profile);
 
-enum avf_aq_hmc_profile {
-       /* AVF_HMC_PROFILE_NO_CHANGE    = 0, reserved */
-       AVF_HMC_PROFILE_DEFAULT = 1,
-       AVF_HMC_PROFILE_FAVOR_VF        = 2,
-       AVF_HMC_PROFILE_EQUAL           = 3,
+enum iavf_aq_hmc_profile {
+       /* IAVF_HMC_PROFILE_NO_CHANGE   = 0, reserved */
+       IAVF_HMC_PROFILE_DEFAULT        = 1,
+       IAVF_HMC_PROFILE_FAVOR_VF       = 2,
+       IAVF_HMC_PROFILE_EQUAL          = 3,
 };
 
 /* Get PHY Abilities (indirect 0x0600) uses the generic indirect struct */
 
 /* set in param0 for get phy abilities to report qualified modules */
-#define AVF_AQ_PHY_REPORT_QUALIFIED_MODULES    0x0001
-#define AVF_AQ_PHY_REPORT_INITIAL_VALUES       0x0002
-
-enum avf_aq_phy_type {
-       AVF_PHY_TYPE_SGMII                      = 0x0,
-       AVF_PHY_TYPE_1000BASE_KX                = 0x1,
-       AVF_PHY_TYPE_10GBASE_KX4                = 0x2,
-       AVF_PHY_TYPE_10GBASE_KR         = 0x3,
-       AVF_PHY_TYPE_40GBASE_KR4                = 0x4,
-       AVF_PHY_TYPE_XAUI                       = 0x5,
-       AVF_PHY_TYPE_XFI                        = 0x6,
-       AVF_PHY_TYPE_SFI                        = 0x7,
-       AVF_PHY_TYPE_XLAUI                      = 0x8,
-       AVF_PHY_TYPE_XLPPI                      = 0x9,
-       AVF_PHY_TYPE_40GBASE_CR4_CU             = 0xA,
-       AVF_PHY_TYPE_10GBASE_CR1_CU             = 0xB,
-       AVF_PHY_TYPE_10GBASE_AOC                = 0xC,
-       AVF_PHY_TYPE_40GBASE_AOC                = 0xD,
-       AVF_PHY_TYPE_UNRECOGNIZED               = 0xE,
-       AVF_PHY_TYPE_UNSUPPORTED                = 0xF,
-       AVF_PHY_TYPE_100BASE_TX         = 0x11,
-       AVF_PHY_TYPE_1000BASE_T         = 0x12,
-       AVF_PHY_TYPE_10GBASE_T                  = 0x13,
-       AVF_PHY_TYPE_10GBASE_SR         = 0x14,
-       AVF_PHY_TYPE_10GBASE_LR         = 0x15,
-       AVF_PHY_TYPE_10GBASE_SFPP_CU            = 0x16,
-       AVF_PHY_TYPE_10GBASE_CR1                = 0x17,
-       AVF_PHY_TYPE_40GBASE_CR4                = 0x18,
-       AVF_PHY_TYPE_40GBASE_SR4                = 0x19,
-       AVF_PHY_TYPE_40GBASE_LR4                = 0x1A,
-       AVF_PHY_TYPE_1000BASE_SX                = 0x1B,
-       AVF_PHY_TYPE_1000BASE_LX                = 0x1C,
-       AVF_PHY_TYPE_1000BASE_T_OPTICAL = 0x1D,
-       AVF_PHY_TYPE_20GBASE_KR2                = 0x1E,
-       AVF_PHY_TYPE_25GBASE_KR         = 0x1F,
-       AVF_PHY_TYPE_25GBASE_CR         = 0x20,
-       AVF_PHY_TYPE_25GBASE_SR         = 0x21,
-       AVF_PHY_TYPE_25GBASE_LR         = 0x22,
-       AVF_PHY_TYPE_25GBASE_AOC                = 0x23,
-       AVF_PHY_TYPE_25GBASE_ACC                = 0x24,
-       AVF_PHY_TYPE_MAX,
-       AVF_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP    = 0xFD,
-       AVF_PHY_TYPE_EMPTY                      = 0xFE,
-       AVF_PHY_TYPE_DEFAULT                    = 0xFF,
-};
-
-#define AVF_LINK_SPEED_100MB_SHIFT     0x1
-#define AVF_LINK_SPEED_1000MB_SHIFT    0x2
-#define AVF_LINK_SPEED_10GB_SHIFT      0x3
-#define AVF_LINK_SPEED_40GB_SHIFT      0x4
-#define AVF_LINK_SPEED_20GB_SHIFT      0x5
-#define AVF_LINK_SPEED_25GB_SHIFT      0x6
-
-enum avf_aq_link_speed {
-       AVF_LINK_SPEED_UNKNOWN  = 0,
-       AVF_LINK_SPEED_100MB    = (1 << AVF_LINK_SPEED_100MB_SHIFT),
-       AVF_LINK_SPEED_1GB      = (1 << AVF_LINK_SPEED_1000MB_SHIFT),
-       AVF_LINK_SPEED_10GB     = (1 << AVF_LINK_SPEED_10GB_SHIFT),
-       AVF_LINK_SPEED_40GB     = (1 << AVF_LINK_SPEED_40GB_SHIFT),
-       AVF_LINK_SPEED_20GB     = (1 << AVF_LINK_SPEED_20GB_SHIFT),
-       AVF_LINK_SPEED_25GB     = (1 << AVF_LINK_SPEED_25GB_SHIFT),
-};
-
-struct avf_aqc_module_desc {
+#define IAVF_AQ_PHY_REPORT_QUALIFIED_MODULES   0x0001
+#define IAVF_AQ_PHY_REPORT_INITIAL_VALUES      0x0002
+
+enum iavf_aq_phy_type {
+       IAVF_PHY_TYPE_SGMII                     = 0x0,
+       IAVF_PHY_TYPE_1000BASE_KX               = 0x1,
+       IAVF_PHY_TYPE_10GBASE_KX4               = 0x2,
+       IAVF_PHY_TYPE_10GBASE_KR                = 0x3,
+       IAVF_PHY_TYPE_40GBASE_KR4               = 0x4,
+       IAVF_PHY_TYPE_XAUI                      = 0x5,
+       IAVF_PHY_TYPE_XFI                       = 0x6,
+       IAVF_PHY_TYPE_SFI                       = 0x7,
+       IAVF_PHY_TYPE_XLAUI                     = 0x8,
+       IAVF_PHY_TYPE_XLPPI                     = 0x9,
+       IAVF_PHY_TYPE_40GBASE_CR4_CU            = 0xA,
+       IAVF_PHY_TYPE_10GBASE_CR1_CU            = 0xB,
+       IAVF_PHY_TYPE_10GBASE_AOC               = 0xC,
+       IAVF_PHY_TYPE_40GBASE_AOC               = 0xD,
+       IAVF_PHY_TYPE_UNRECOGNIZED              = 0xE,
+       IAVF_PHY_TYPE_UNSUPPORTED               = 0xF,
+       IAVF_PHY_TYPE_100BASE_TX                = 0x11,
+       IAVF_PHY_TYPE_1000BASE_T                = 0x12,
+       IAVF_PHY_TYPE_10GBASE_T                 = 0x13,
+       IAVF_PHY_TYPE_10GBASE_SR                = 0x14,
+       IAVF_PHY_TYPE_10GBASE_LR                = 0x15,
+       IAVF_PHY_TYPE_10GBASE_SFPP_CU           = 0x16,
+       IAVF_PHY_TYPE_10GBASE_CR1               = 0x17,
+       IAVF_PHY_TYPE_40GBASE_CR4               = 0x18,
+       IAVF_PHY_TYPE_40GBASE_SR4               = 0x19,
+       IAVF_PHY_TYPE_40GBASE_LR4               = 0x1A,
+       IAVF_PHY_TYPE_1000BASE_SX               = 0x1B,
+       IAVF_PHY_TYPE_1000BASE_LX               = 0x1C,
+       IAVF_PHY_TYPE_1000BASE_T_OPTICAL        = 0x1D,
+       IAVF_PHY_TYPE_20GBASE_KR2               = 0x1E,
+       IAVF_PHY_TYPE_25GBASE_KR                = 0x1F,
+       IAVF_PHY_TYPE_25GBASE_CR                = 0x20,
+       IAVF_PHY_TYPE_25GBASE_SR                = 0x21,
+       IAVF_PHY_TYPE_25GBASE_LR                = 0x22,
+       IAVF_PHY_TYPE_25GBASE_AOC               = 0x23,
+       IAVF_PHY_TYPE_25GBASE_ACC               = 0x24,
+       IAVF_PHY_TYPE_MAX,
+       IAVF_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP   = 0xFD,
+       IAVF_PHY_TYPE_EMPTY                     = 0xFE,
+       IAVF_PHY_TYPE_DEFAULT                   = 0xFF,
+};
+
+#define IAVF_LINK_SPEED_100MB_SHIFT    0x1
+#define IAVF_LINK_SPEED_1000MB_SHIFT   0x2
+#define IAVF_LINK_SPEED_10GB_SHIFT     0x3
+#define IAVF_LINK_SPEED_40GB_SHIFT     0x4
+#define IAVF_LINK_SPEED_20GB_SHIFT     0x5
+#define IAVF_LINK_SPEED_25GB_SHIFT     0x6
+
+enum iavf_aq_link_speed {
+       IAVF_LINK_SPEED_UNKNOWN = 0,
+       IAVF_LINK_SPEED_100MB   = (1 << IAVF_LINK_SPEED_100MB_SHIFT),
+       IAVF_LINK_SPEED_1GB     = (1 << IAVF_LINK_SPEED_1000MB_SHIFT),
+       IAVF_LINK_SPEED_10GB    = (1 << IAVF_LINK_SPEED_10GB_SHIFT),
+       IAVF_LINK_SPEED_40GB    = (1 << IAVF_LINK_SPEED_40GB_SHIFT),
+       IAVF_LINK_SPEED_20GB    = (1 << IAVF_LINK_SPEED_20GB_SHIFT),
+       IAVF_LINK_SPEED_25GB    = (1 << IAVF_LINK_SPEED_25GB_SHIFT),
+};
+
+struct iavf_aqc_module_desc {
        u8 oui[3];
        u8 reserved1;
        u8 part_number[16];
@@ -1911,184 +1911,184 @@ struct avf_aqc_module_desc {
        u8 reserved2[8];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_module_desc);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_module_desc);
 
-struct avf_aq_get_phy_abilities_resp {
+struct iavf_aq_get_phy_abilities_resp {
        __le32  phy_type;       /* bitmap using the above enum for offsets */
        u8      link_speed;     /* bitmap using the above enum bit patterns */
        u8      abilities;
-#define AVF_AQ_PHY_FLAG_PAUSE_TX       0x01
-#define AVF_AQ_PHY_FLAG_PAUSE_RX       0x02
-#define AVF_AQ_PHY_FLAG_LOW_POWER      0x04
-#define AVF_AQ_PHY_LINK_ENABLED        0x08
-#define AVF_AQ_PHY_AN_ENABLED          0x10
-#define AVF_AQ_PHY_FLAG_MODULE_QUAL    0x20
-#define AVF_AQ_PHY_FEC_ABILITY_KR      0x40
-#define AVF_AQ_PHY_FEC_ABILITY_RS      0x80
+#define IAVF_AQ_PHY_FLAG_PAUSE_TX      0x01
+#define IAVF_AQ_PHY_FLAG_PAUSE_RX      0x02
+#define IAVF_AQ_PHY_FLAG_LOW_POWER     0x04
+#define IAVF_AQ_PHY_LINK_ENABLED       0x08
+#define IAVF_AQ_PHY_AN_ENABLED         0x10
+#define IAVF_AQ_PHY_FLAG_MODULE_QUAL   0x20
+#define IAVF_AQ_PHY_FEC_ABILITY_KR     0x40
+#define IAVF_AQ_PHY_FEC_ABILITY_RS     0x80
        __le16  eee_capability;
-#define AVF_AQ_EEE_100BASE_TX          0x0002
-#define AVF_AQ_EEE_1000BASE_T          0x0004
-#define AVF_AQ_EEE_10GBASE_T           0x0008
-#define AVF_AQ_EEE_1000BASE_KX         0x0010
-#define AVF_AQ_EEE_10GBASE_KX4         0x0020
-#define AVF_AQ_EEE_10GBASE_KR          0x0040
+#define IAVF_AQ_EEE_100BASE_TX         0x0002
+#define IAVF_AQ_EEE_1000BASE_T         0x0004
+#define IAVF_AQ_EEE_10GBASE_T          0x0008
+#define IAVF_AQ_EEE_1000BASE_KX                0x0010
+#define IAVF_AQ_EEE_10GBASE_KX4                0x0020
+#define IAVF_AQ_EEE_10GBASE_KR         0x0040
        __le32  eeer_val;
        u8      d3_lpan;
-#define AVF_AQ_SET_PHY_D3_LPAN_ENA     0x01
+#define IAVF_AQ_SET_PHY_D3_LPAN_ENA    0x01
        u8      phy_type_ext;
-#define AVF_AQ_PHY_TYPE_EXT_25G_KR     0x01
-#define AVF_AQ_PHY_TYPE_EXT_25G_CR     0x02
-#define AVF_AQ_PHY_TYPE_EXT_25G_SR     0x04
-#define AVF_AQ_PHY_TYPE_EXT_25G_LR     0x08
-#define AVF_AQ_PHY_TYPE_EXT_25G_AOC    0x10
-#define AVF_AQ_PHY_TYPE_EXT_25G_ACC    0x20
+#define IAVF_AQ_PHY_TYPE_EXT_25G_KR    0x01
+#define IAVF_AQ_PHY_TYPE_EXT_25G_CR    0x02
+#define IAVF_AQ_PHY_TYPE_EXT_25G_SR    0x04
+#define IAVF_AQ_PHY_TYPE_EXT_25G_LR    0x08
+#define IAVF_AQ_PHY_TYPE_EXT_25G_AOC   0x10
+#define IAVF_AQ_PHY_TYPE_EXT_25G_ACC   0x20
        u8      fec_cfg_curr_mod_ext_info;
-#define AVF_AQ_ENABLE_FEC_KR           0x01
-#define AVF_AQ_ENABLE_FEC_RS           0x02
-#define AVF_AQ_REQUEST_FEC_KR          0x04
-#define AVF_AQ_REQUEST_FEC_RS          0x08
-#define AVF_AQ_ENABLE_FEC_AUTO         0x10
-#define AVF_AQ_FEC
-#define AVF_AQ_MODULE_TYPE_EXT_MASK    0xE0
-#define AVF_AQ_MODULE_TYPE_EXT_SHIFT   5
+#define IAVF_AQ_ENABLE_FEC_KR          0x01
+#define IAVF_AQ_ENABLE_FEC_RS          0x02
+#define IAVF_AQ_REQUEST_FEC_KR         0x04
+#define IAVF_AQ_REQUEST_FEC_RS         0x08
+#define IAVF_AQ_ENABLE_FEC_AUTO                0x10
+#define IAVF_AQ_FEC
+#define IAVF_AQ_MODULE_TYPE_EXT_MASK   0xE0
+#define IAVF_AQ_MODULE_TYPE_EXT_SHIFT  5
 
        u8      ext_comp_code;
        u8      phy_id[4];
        u8      module_type[3];
        u8      qualified_module_count;
-#define AVF_AQ_PHY_MAX_QMS             16
-       struct avf_aqc_module_desc      qualified_module[AVF_AQ_PHY_MAX_QMS];
+#define IAVF_AQ_PHY_MAX_QMS            16
+       struct iavf_aqc_module_desc     qualified_module[IAVF_AQ_PHY_MAX_QMS];
 };
 
-AVF_CHECK_STRUCT_LEN(0x218, avf_aq_get_phy_abilities_resp);
+IAVF_CHECK_STRUCT_LEN(0x218, iavf_aq_get_phy_abilities_resp);
 
 /* Set PHY Config (direct 0x0601) */
-struct avf_aq_set_phy_config { /* same bits as above in all */
+struct iavf_aq_set_phy_config { /* same bits as above in all */
        __le32  phy_type;
        u8      link_speed;
        u8      abilities;
 /* bits 0-2 use the values from get_phy_abilities_resp */
-#define AVF_AQ_PHY_ENABLE_LINK         0x08
-#define AVF_AQ_PHY_ENABLE_AN           0x10
-#define AVF_AQ_PHY_ENABLE_ATOMIC_LINK  0x20
+#define IAVF_AQ_PHY_ENABLE_LINK                0x08
+#define IAVF_AQ_PHY_ENABLE_AN          0x10
+#define IAVF_AQ_PHY_ENABLE_ATOMIC_LINK 0x20
        __le16  eee_capability;
        __le32  eeer;
        u8      low_power_ctrl;
        u8      phy_type_ext;
        u8      fec_config;
-#define AVF_AQ_SET_FEC_ABILITY_KR      BIT(0)
-#define AVF_AQ_SET_FEC_ABILITY_RS      BIT(1)
-#define AVF_AQ_SET_FEC_REQUEST_KR      BIT(2)
-#define AVF_AQ_SET_FEC_REQUEST_RS      BIT(3)
-#define AVF_AQ_SET_FEC_AUTO            BIT(4)
-#define AVF_AQ_PHY_FEC_CONFIG_SHIFT    0x0
-#define AVF_AQ_PHY_FEC_CONFIG_MASK     (0x1F << AVF_AQ_PHY_FEC_CONFIG_SHIFT)
+#define IAVF_AQ_SET_FEC_ABILITY_KR     BIT(0)
+#define IAVF_AQ_SET_FEC_ABILITY_RS     BIT(1)
+#define IAVF_AQ_SET_FEC_REQUEST_KR     BIT(2)
+#define IAVF_AQ_SET_FEC_REQUEST_RS     BIT(3)
+#define IAVF_AQ_SET_FEC_AUTO           BIT(4)
+#define IAVF_AQ_PHY_FEC_CONFIG_SHIFT   0x0
+#define IAVF_AQ_PHY_FEC_CONFIG_MASK    (0x1F << IAVF_AQ_PHY_FEC_CONFIG_SHIFT)
        u8      reserved;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aq_set_phy_config);
+IAVF_CHECK_CMD_LENGTH(iavf_aq_set_phy_config);
 
 /* Set MAC Config command data structure (direct 0x0603) */
-struct avf_aq_set_mac_config {
+struct iavf_aq_set_mac_config {
        __le16  max_frame_size;
        u8      params;
-#define AVF_AQ_SET_MAC_CONFIG_CRC_EN           0x04
-#define AVF_AQ_SET_MAC_CONFIG_PACING_MASK      0x78
-#define AVF_AQ_SET_MAC_CONFIG_PACING_SHIFT     3
-#define AVF_AQ_SET_MAC_CONFIG_PACING_NONE      0x0
-#define AVF_AQ_SET_MAC_CONFIG_PACING_1B_13TX   0xF
-#define AVF_AQ_SET_MAC_CONFIG_PACING_1DW_9TX   0x9
-#define AVF_AQ_SET_MAC_CONFIG_PACING_1DW_4TX   0x8
-#define AVF_AQ_SET_MAC_CONFIG_PACING_3DW_7TX   0x7
-#define AVF_AQ_SET_MAC_CONFIG_PACING_2DW_3TX   0x6
-#define AVF_AQ_SET_MAC_CONFIG_PACING_1DW_1TX   0x5
-#define AVF_AQ_SET_MAC_CONFIG_PACING_3DW_2TX   0x4
-#define AVF_AQ_SET_MAC_CONFIG_PACING_7DW_3TX   0x3
-#define AVF_AQ_SET_MAC_CONFIG_PACING_4DW_1TX   0x2
-#define AVF_AQ_SET_MAC_CONFIG_PACING_9DW_1TX   0x1
+#define IAVF_AQ_SET_MAC_CONFIG_CRC_EN          0x04
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_MASK     0x78
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_SHIFT    3
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_NONE     0x0
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_1B_13TX  0xF
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_1DW_9TX  0x9
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_1DW_4TX  0x8
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_3DW_7TX  0x7
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_2DW_3TX  0x6
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_1DW_1TX  0x5
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_3DW_2TX  0x4
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_7DW_3TX  0x3
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_4DW_1TX  0x2
+#define IAVF_AQ_SET_MAC_CONFIG_PACING_9DW_1TX  0x1
        u8      tx_timer_priority; /* bitmap */
        __le16  tx_timer_value;
        __le16  fc_refresh_threshold;
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aq_set_mac_config);
+IAVF_CHECK_CMD_LENGTH(iavf_aq_set_mac_config);
 
 /* Restart Auto-Negotiation (direct 0x605) */
-struct avf_aqc_set_link_restart_an {
+struct iavf_aqc_set_link_restart_an {
        u8      command;
-#define AVF_AQ_PHY_RESTART_AN  0x02
-#define AVF_AQ_PHY_LINK_ENABLE 0x04
+#define IAVF_AQ_PHY_RESTART_AN 0x02
+#define IAVF_AQ_PHY_LINK_ENABLE        0x04
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_link_restart_an);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_link_restart_an);
 
 /* Get Link Status cmd & response data structure (direct 0x0607) */
-struct avf_aqc_get_link_status {
+struct iavf_aqc_get_link_status {
        __le16  command_flags; /* only field set on command */
-#define AVF_AQ_LSE_MASK                0x3
-#define AVF_AQ_LSE_NOP                 0x0
-#define AVF_AQ_LSE_DISABLE             0x2
-#define AVF_AQ_LSE_ENABLE              0x3
+#define IAVF_AQ_LSE_MASK               0x3
+#define IAVF_AQ_LSE_NOP                        0x0
+#define IAVF_AQ_LSE_DISABLE            0x2
+#define IAVF_AQ_LSE_ENABLE             0x3
 /* only response uses this flag */
-#define AVF_AQ_LSE_IS_ENABLED          0x1
-       u8      phy_type;    /* avf_aq_phy_type   */
-       u8      link_speed;  /* avf_aq_link_speed */
+#define IAVF_AQ_LSE_IS_ENABLED         0x1
+       u8      phy_type;    /* iavf_aq_phy_type   */
+       u8      link_speed;  /* iavf_aq_link_speed */
        u8      link_info;
-#define AVF_AQ_LINK_UP                 0x01    /* obsolete */
-#define AVF_AQ_LINK_UP_FUNCTION        0x01
-#define AVF_AQ_LINK_FAULT              0x02
-#define AVF_AQ_LINK_FAULT_TX           0x04
-#define AVF_AQ_LINK_FAULT_RX           0x08
-#define AVF_AQ_LINK_FAULT_REMOTE       0x10
-#define AVF_AQ_LINK_UP_PORT            0x20
-#define AVF_AQ_MEDIA_AVAILABLE         0x40
-#define AVF_AQ_SIGNAL_DETECT           0x80
+#define IAVF_AQ_LINK_UP                        0x01    /* obsolete */
+#define IAVF_AQ_LINK_UP_FUNCTION       0x01
+#define IAVF_AQ_LINK_FAULT             0x02
+#define IAVF_AQ_LINK_FAULT_TX          0x04
+#define IAVF_AQ_LINK_FAULT_RX          0x08
+#define IAVF_AQ_LINK_FAULT_REMOTE      0x10
+#define IAVF_AQ_LINK_UP_PORT           0x20
+#define IAVF_AQ_MEDIA_AVAILABLE                0x40
+#define IAVF_AQ_SIGNAL_DETECT          0x80
        u8      an_info;
-#define AVF_AQ_AN_COMPLETED            0x01
-#define AVF_AQ_LP_AN_ABILITY           0x02
-#define AVF_AQ_PD_FAULT                0x04
-#define AVF_AQ_FEC_EN                  0x08
-#define AVF_AQ_PHY_LOW_POWER           0x10
-#define AVF_AQ_LINK_PAUSE_TX           0x20
-#define AVF_AQ_LINK_PAUSE_RX           0x40
-#define AVF_AQ_QUALIFIED_MODULE        0x80
+#define IAVF_AQ_AN_COMPLETED           0x01
+#define IAVF_AQ_LP_AN_ABILITY          0x02
+#define IAVF_AQ_PD_FAULT               0x04
+#define IAVF_AQ_FEC_EN                 0x08
+#define IAVF_AQ_PHY_LOW_POWER          0x10
+#define IAVF_AQ_LINK_PAUSE_TX          0x20
+#define IAVF_AQ_LINK_PAUSE_RX          0x40
+#define IAVF_AQ_QUALIFIED_MODULE       0x80
        u8      ext_info;
-#define AVF_AQ_LINK_PHY_TEMP_ALARM     0x01
-#define AVF_AQ_LINK_XCESSIVE_ERRORS    0x02
-#define AVF_AQ_LINK_TX_SHIFT           0x02
-#define AVF_AQ_LINK_TX_MASK            (0x03 << AVF_AQ_LINK_TX_SHIFT)
-#define AVF_AQ_LINK_TX_ACTIVE          0x00
-#define AVF_AQ_LINK_TX_DRAINED         0x01
-#define AVF_AQ_LINK_TX_FLUSHED         0x03
-#define AVF_AQ_LINK_FORCED_40G         0x10
+#define IAVF_AQ_LINK_PHY_TEMP_ALARM    0x01
+#define IAVF_AQ_LINK_XCESSIVE_ERRORS   0x02
+#define IAVF_AQ_LINK_TX_SHIFT          0x02
+#define IAVF_AQ_LINK_TX_MASK           (0x03 << IAVF_AQ_LINK_TX_SHIFT)
+#define IAVF_AQ_LINK_TX_ACTIVE         0x00
+#define IAVF_AQ_LINK_TX_DRAINED                0x01
+#define IAVF_AQ_LINK_TX_FLUSHED                0x03
+#define IAVF_AQ_LINK_FORCED_40G                0x10
 /* 25G Error Codes */
-#define AVF_AQ_25G_NO_ERR              0X00
-#define AVF_AQ_25G_NOT_PRESENT         0X01
-#define AVF_AQ_25G_NVM_CRC_ERR         0X02
-#define AVF_AQ_25G_SBUS_UCODE_ERR      0X03
-#define AVF_AQ_25G_SERDES_UCODE_ERR    0X04
-#define AVF_AQ_25G_NIMB_UCODE_ERR      0X05
-       u8      loopback; /* use defines from avf_aqc_set_lb_mode */
+#define IAVF_AQ_25G_NO_ERR             0X00
+#define IAVF_AQ_25G_NOT_PRESENT                0X01
+#define IAVF_AQ_25G_NVM_CRC_ERR                0X02
+#define IAVF_AQ_25G_SBUS_UCODE_ERR     0X03
+#define IAVF_AQ_25G_SERDES_UCODE_ERR   0X04
+#define IAVF_AQ_25G_NIMB_UCODE_ERR     0X05
+       u8      loopback; /* use defines from iavf_aqc_set_lb_mode */
 /* Since firmware API 1.7 loopback field keeps power class info as well */
-#define AVF_AQ_LOOPBACK_MASK           0x07
-#define AVF_AQ_PWR_CLASS_SHIFT_LB      6
-#define AVF_AQ_PWR_CLASS_MASK_LB       (0x03 << AVF_AQ_PWR_CLASS_SHIFT_LB)
+#define IAVF_AQ_LOOPBACK_MASK          0x07
+#define IAVF_AQ_PWR_CLASS_SHIFT_LB     6
+#define IAVF_AQ_PWR_CLASS_MASK_LB      (0x03 << IAVF_AQ_PWR_CLASS_SHIFT_LB)
        __le16  max_frame_size;
        u8      config;
-#define AVF_AQ_CONFIG_FEC_KR_ENA       0x01
-#define AVF_AQ_CONFIG_FEC_RS_ENA       0x02
-#define AVF_AQ_CONFIG_CRC_ENA          0x04
-#define AVF_AQ_CONFIG_PACING_MASK      0x78
+#define IAVF_AQ_CONFIG_FEC_KR_ENA      0x01
+#define IAVF_AQ_CONFIG_FEC_RS_ENA      0x02
+#define IAVF_AQ_CONFIG_CRC_ENA         0x04
+#define IAVF_AQ_CONFIG_PACING_MASK     0x78
        union {
                struct {
                        u8      power_desc;
-#define AVF_AQ_LINK_POWER_CLASS_1      0x00
-#define AVF_AQ_LINK_POWER_CLASS_2      0x01
-#define AVF_AQ_LINK_POWER_CLASS_3      0x02
-#define AVF_AQ_LINK_POWER_CLASS_4      0x03
-#define AVF_AQ_PWR_CLASS_MASK          0x03
+#define IAVF_AQ_LINK_POWER_CLASS_1     0x00
+#define IAVF_AQ_LINK_POWER_CLASS_2     0x01
+#define IAVF_AQ_LINK_POWER_CLASS_3     0x02
+#define IAVF_AQ_LINK_POWER_CLASS_4     0x03
+#define IAVF_AQ_PWR_CLASS_MASK         0x03
                        u8      reserved[4];
                };
                struct {
@@ -2098,93 +2098,93 @@ struct avf_aqc_get_link_status {
        };
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_link_status);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_link_status);
 
 /* Set event mask command (direct 0x613) */
-struct avf_aqc_set_phy_int_mask {
+struct iavf_aqc_set_phy_int_mask {
        u8      reserved[8];
        __le16  event_mask;
-#define AVF_AQ_EVENT_LINK_UPDOWN       0x0002
-#define AVF_AQ_EVENT_MEDIA_NA          0x0004
-#define AVF_AQ_EVENT_LINK_FAULT        0x0008
-#define AVF_AQ_EVENT_PHY_TEMP_ALARM    0x0010
-#define AVF_AQ_EVENT_EXCESSIVE_ERRORS  0x0020
-#define AVF_AQ_EVENT_SIGNAL_DETECT     0x0040
-#define AVF_AQ_EVENT_AN_COMPLETED      0x0080
-#define AVF_AQ_EVENT_MODULE_QUAL_FAIL  0x0100
-#define AVF_AQ_EVENT_PORT_TX_SUSPENDED 0x0200
+#define IAVF_AQ_EVENT_LINK_UPDOWN      0x0002
+#define IAVF_AQ_EVENT_MEDIA_NA         0x0004
+#define IAVF_AQ_EVENT_LINK_FAULT       0x0008
+#define IAVF_AQ_EVENT_PHY_TEMP_ALARM   0x0010
+#define IAVF_AQ_EVENT_EXCESSIVE_ERRORS 0x0020
+#define IAVF_AQ_EVENT_SIGNAL_DETECT    0x0040
+#define IAVF_AQ_EVENT_AN_COMPLETED     0x0080
+#define IAVF_AQ_EVENT_MODULE_QUAL_FAIL 0x0100
+#define IAVF_AQ_EVENT_PORT_TX_SUSPENDED        0x0200
        u8      reserved1[6];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_phy_int_mask);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_phy_int_mask);
 
 /* Get Local AN advt register (direct 0x0614)
  * Set Local AN advt register (direct 0x0615)
  * Get Link Partner AN advt register (direct 0x0616)
  */
-struct avf_aqc_an_advt_reg {
+struct iavf_aqc_an_advt_reg {
        __le32  local_an_reg0;
        __le16  local_an_reg1;
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_an_advt_reg);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_an_advt_reg);
 
 /* Set Loopback mode (0x0618) */
-struct avf_aqc_set_lb_mode {
+struct iavf_aqc_set_lb_mode {
        u8      lb_level;
-#define AVF_AQ_LB_NONE 0
-#define AVF_AQ_LB_MAC  1
-#define AVF_AQ_LB_SERDES       2
-#define AVF_AQ_LB_PHY_INT      3
-#define AVF_AQ_LB_PHY_EXT      4
-#define AVF_AQ_LB_CPVL_PCS     5
-#define AVF_AQ_LB_CPVL_EXT     6
-#define AVF_AQ_LB_PHY_LOCAL    0x01
-#define AVF_AQ_LB_PHY_REMOTE   0x02
-#define AVF_AQ_LB_MAC_LOCAL    0x04
+#define IAVF_AQ_LB_NONE        0
+#define IAVF_AQ_LB_MAC 1
+#define IAVF_AQ_LB_SERDES      2
+#define IAVF_AQ_LB_PHY_INT     3
+#define IAVF_AQ_LB_PHY_EXT     4
+#define IAVF_AQ_LB_CPVL_PCS    5
+#define IAVF_AQ_LB_CPVL_EXT    6
+#define IAVF_AQ_LB_PHY_LOCAL   0x01
+#define IAVF_AQ_LB_PHY_REMOTE  0x02
+#define IAVF_AQ_LB_MAC_LOCAL   0x04
        u8      lb_type;
-#define AVF_AQ_LB_LOCAL        0
-#define AVF_AQ_LB_FAR  0x01
+#define IAVF_AQ_LB_LOCAL       0
+#define IAVF_AQ_LB_FAR 0x01
        u8      speed;
-#define AVF_AQ_LB_SPEED_NONE   0
-#define AVF_AQ_LB_SPEED_1G     1
-#define AVF_AQ_LB_SPEED_10G    2
-#define AVF_AQ_LB_SPEED_40G    3
-#define AVF_AQ_LB_SPEED_20G    4
+#define IAVF_AQ_LB_SPEED_NONE  0
+#define IAVF_AQ_LB_SPEED_1G    1
+#define IAVF_AQ_LB_SPEED_10G   2
+#define IAVF_AQ_LB_SPEED_40G   3
+#define IAVF_AQ_LB_SPEED_20G   4
        u8      force_speed;
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_lb_mode);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_lb_mode);
 
 /* Set PHY Debug command (0x0622) */
-struct avf_aqc_set_phy_debug {
+struct iavf_aqc_set_phy_debug {
        u8      command_flags;
-#define AVF_AQ_PHY_DEBUG_RESET_INTERNAL        0x02
-#define AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT  2
-#define AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_MASK   (0x03 << \
-                                       AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT)
-#define AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_NONE   0x00
-#define AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_HARD   0x01
-#define AVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SOFT   0x02
+#define IAVF_AQ_PHY_DEBUG_RESET_INTERNAL       0x02
+#define IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT 2
+#define IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_MASK  (0x03 << \
+                                       IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SHIFT)
+#define IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_NONE  0x00
+#define IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_HARD  0x01
+#define IAVF_AQ_PHY_DEBUG_RESET_EXTERNAL_SOFT  0x02
 /* Disable link manageability on a single port */
-#define AVF_AQ_PHY_DEBUG_DISABLE_LINK_FW       0x10
+#define IAVF_AQ_PHY_DEBUG_DISABLE_LINK_FW      0x10
 /* Disable link manageability on all ports needs both bits 4 and 5 */
-#define AVF_AQ_PHY_DEBUG_DISABLE_ALL_LINK_FW   0x20
+#define IAVF_AQ_PHY_DEBUG_DISABLE_ALL_LINK_FW  0x20
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_phy_debug);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_phy_debug);
 
-enum avf_aq_phy_reg_type {
-       AVF_AQC_PHY_REG_INTERNAL        = 0x1,
-       AVF_AQC_PHY_REG_EXERNAL_BASET   = 0x2,
-       AVF_AQC_PHY_REG_EXERNAL_MODULE  = 0x3
+enum iavf_aq_phy_reg_type {
+       IAVF_AQC_PHY_REG_INTERNAL       = 0x1,
+       IAVF_AQC_PHY_REG_EXERNAL_BASET  = 0x2,
+       IAVF_AQC_PHY_REG_EXERNAL_MODULE = 0x3
 };
 
 /* Run PHY Activity (0x0626) */
-struct avf_aqc_run_phy_activity {
+struct iavf_aqc_run_phy_activity {
        __le16  activity_id;
        u8      flags;
        u8      reserved1;
@@ -2193,15 +2193,15 @@ struct avf_aqc_run_phy_activity {
        u8      reserved2[4];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_run_phy_activity);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_run_phy_activity);
 
 /* Set PHY Register command (0x0628) */
 /* Get PHY Register command (0x0629) */
-struct avf_aqc_phy_register_access {
+struct iavf_aqc_phy_register_access {
        u8      phy_interface;
-#define AVF_AQ_PHY_REG_ACCESS_INTERNAL 0
-#define AVF_AQ_PHY_REG_ACCESS_EXTERNAL 1
-#define AVF_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE  2
+#define IAVF_AQ_PHY_REG_ACCESS_INTERNAL        0
+#define IAVF_AQ_PHY_REG_ACCESS_EXTERNAL        1
+#define IAVF_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2
        u8      dev_addres;
        u8      reserved1[2];
        __le32  reg_address;
@@ -2209,20 +2209,20 @@ struct avf_aqc_phy_register_access {
        u8      reserved2[4];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_phy_register_access);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_phy_register_access);
 
 /* NVM Read command (indirect 0x0701)
  * NVM Erase commands (direct 0x0702)
  * NVM Update commands (indirect 0x0703)
  */
-struct avf_aqc_nvm_update {
+struct iavf_aqc_nvm_update {
        u8      command_flags;
-#define AVF_AQ_NVM_LAST_CMD                    0x01
-#define AVF_AQ_NVM_FLASH_ONLY                  0x80
-#define AVF_AQ_NVM_PRESERVATION_FLAGS_SHIFT    1
-#define AVF_AQ_NVM_PRESERVATION_FLAGS_MASK     0x03
-#define AVF_AQ_NVM_PRESERVATION_FLAGS_SELECTED 0x03
-#define AVF_AQ_NVM_PRESERVATION_FLAGS_ALL      0x01
+#define IAVF_AQ_NVM_LAST_CMD                   0x01
+#define IAVF_AQ_NVM_FLASH_ONLY                 0x80
+#define IAVF_AQ_NVM_PRESERVATION_FLAGS_SHIFT   1
+#define IAVF_AQ_NVM_PRESERVATION_FLAGS_MASK    0x03
+#define IAVF_AQ_NVM_PRESERVATION_FLAGS_SELECTED        0x03
+#define IAVF_AQ_NVM_PRESERVATION_FLAGS_ALL     0x01
        u8      module_pointer;
        __le16  length;
        __le32  offset;
@@ -2230,14 +2230,14 @@ struct avf_aqc_nvm_update {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_nvm_update);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_nvm_update);
 
 /* NVM Config Read (indirect 0x0704) */
-struct avf_aqc_nvm_config_read {
+struct iavf_aqc_nvm_config_read {
        __le16  cmd_flags;
-#define AVF_AQ_ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK   1
-#define AVF_AQ_ANVM_READ_SINGLE_FEATURE                0
-#define AVF_AQ_ANVM_READ_MULTIPLE_FEATURES             1
+#define IAVF_AQ_ANVM_SINGLE_OR_MULTIPLE_FEATURES_MASK  1
+#define IAVF_AQ_ANVM_READ_SINGLE_FEATURE               0
+#define IAVF_AQ_ANVM_READ_MULTIPLE_FEATURES            1
        __le16  element_count;
        __le16  element_id;     /* Feature/field ID */
        __le16  element_id_msw; /* MSWord of field ID */
@@ -2245,10 +2245,10 @@ struct avf_aqc_nvm_config_read {
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_nvm_config_read);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_nvm_config_read);
 
 /* NVM Config Write (indirect 0x0705) */
-struct avf_aqc_nvm_config_write {
+struct iavf_aqc_nvm_config_write {
        __le16  cmd_flags;
        __le16  element_count;
        u8      reserved[4];
@@ -2256,162 +2256,162 @@ struct avf_aqc_nvm_config_write {
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_nvm_config_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_nvm_config_write);
 
 /* Used for 0x0704 as well as for 0x0705 commands */
-#define AVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT         1
-#define AVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_MASK \
-                               (1 << AVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT)
-#define AVF_AQ_ANVM_FEATURE            0
-#define AVF_AQ_ANVM_IMMEDIATE_FIELD    (1 << FEATURE_OR_IMMEDIATE_SHIFT)
-struct avf_aqc_nvm_config_data_feature {
+#define IAVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT                1
+#define IAVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_MASK \
+                               (1 << IAVF_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT)
+#define IAVF_AQ_ANVM_FEATURE           0
+#define IAVF_AQ_ANVM_IMMEDIATE_FIELD   (1 << FEATURE_OR_IMMEDIATE_SHIFT)
+struct iavf_aqc_nvm_config_data_feature {
        __le16 feature_id;
-#define AVF_AQ_ANVM_FEATURE_OPTION_OEM_ONLY            0x01
-#define AVF_AQ_ANVM_FEATURE_OPTION_DWORD_MAP           0x08
-#define AVF_AQ_ANVM_FEATURE_OPTION_POR_CSR             0x10
+#define IAVF_AQ_ANVM_FEATURE_OPTION_OEM_ONLY           0x01
+#define IAVF_AQ_ANVM_FEATURE_OPTION_DWORD_MAP          0x08
+#define IAVF_AQ_ANVM_FEATURE_OPTION_POR_CSR            0x10
        __le16 feature_options;
        __le16 feature_selection;
 };
 
-AVF_CHECK_STRUCT_LEN(0x6, avf_aqc_nvm_config_data_feature);
+IAVF_CHECK_STRUCT_LEN(0x6, iavf_aqc_nvm_config_data_feature);
 
-struct avf_aqc_nvm_config_data_immediate_field {
+struct iavf_aqc_nvm_config_data_immediate_field {
        __le32 field_id;
        __le32 field_value;
        __le16 field_options;
        __le16 reserved;
 };
 
-AVF_CHECK_STRUCT_LEN(0xc, avf_aqc_nvm_config_data_immediate_field);
+IAVF_CHECK_STRUCT_LEN(0xc, iavf_aqc_nvm_config_data_immediate_field);
 
 /* OEM Post Update (indirect 0x0720)
  * no command data struct used
  */
-struct avf_aqc_nvm_oem_post_update {
-#define AVF_AQ_NVM_OEM_POST_UPDATE_EXTERNAL_DATA       0x01
+struct iavf_aqc_nvm_oem_post_update {
+#define IAVF_AQ_NVM_OEM_POST_UPDATE_EXTERNAL_DATA      0x01
        u8 sel_data;
        u8 reserved[7];
 };
 
-AVF_CHECK_STRUCT_LEN(0x8, avf_aqc_nvm_oem_post_update);
+IAVF_CHECK_STRUCT_LEN(0x8, iavf_aqc_nvm_oem_post_update);
 
-struct avf_aqc_nvm_oem_post_update_buffer {
+struct iavf_aqc_nvm_oem_post_update_buffer {
        u8 str_len;
        u8 dev_addr;
        __le16 eeprom_addr;
        u8 data[36];
 };
 
-AVF_CHECK_STRUCT_LEN(0x28, avf_aqc_nvm_oem_post_update_buffer);
+IAVF_CHECK_STRUCT_LEN(0x28, iavf_aqc_nvm_oem_post_update_buffer);
 
 /* Thermal Sensor (indirect 0x0721)
  *     read or set thermal sensor configs and values
  *     takes a sensor and command specific data buffer, not detailed here
  */
-struct avf_aqc_thermal_sensor {
+struct iavf_aqc_thermal_sensor {
        u8 sensor_action;
-#define AVF_AQ_THERMAL_SENSOR_READ_CONFIG      0
-#define AVF_AQ_THERMAL_SENSOR_SET_CONFIG       1
-#define AVF_AQ_THERMAL_SENSOR_READ_TEMP        2
+#define IAVF_AQ_THERMAL_SENSOR_READ_CONFIG     0
+#define IAVF_AQ_THERMAL_SENSOR_SET_CONFIG      1
+#define IAVF_AQ_THERMAL_SENSOR_READ_TEMP       2
        u8 reserved[7];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_thermal_sensor);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_thermal_sensor);
 
 /* Send to PF command (indirect 0x0801) id is only used by PF
  * Send to VF command (indirect 0x0802) id is only used by PF
  * Send to Peer PF command (indirect 0x0803)
  */
-struct avf_aqc_pf_vf_message {
+struct iavf_aqc_pf_vf_message {
        __le32  id;
        u8      reserved[4];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_pf_vf_message);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_pf_vf_message);
 
 /* Alternate structure */
 
 /* Direct write (direct 0x0900)
  * Direct read (direct 0x0902)
  */
-struct avf_aqc_alternate_write {
+struct iavf_aqc_alternate_write {
        __le32 address0;
        __le32 data0;
        __le32 address1;
        __le32 data1;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_alternate_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_alternate_write);
 
 /* Indirect write (indirect 0x0901)
  * Indirect read (indirect 0x0903)
  */
 
-struct avf_aqc_alternate_ind_write {
+struct iavf_aqc_alternate_ind_write {
        __le32 address;
        __le32 length;
        __le32 addr_high;
        __le32 addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_alternate_ind_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_alternate_ind_write);
 
 /* Done alternate write (direct 0x0904)
- * uses avf_aq_desc
+ * uses iavf_aq_desc
  */
-struct avf_aqc_alternate_write_done {
+struct iavf_aqc_alternate_write_done {
        __le16  cmd_flags;
-#define AVF_AQ_ALTERNATE_MODE_BIOS_MASK        1
-#define AVF_AQ_ALTERNATE_MODE_BIOS_LEGACY      0
-#define AVF_AQ_ALTERNATE_MODE_BIOS_UEFI        1
-#define AVF_AQ_ALTERNATE_RESET_NEEDED          2
+#define IAVF_AQ_ALTERNATE_MODE_BIOS_MASK       1
+#define IAVF_AQ_ALTERNATE_MODE_BIOS_LEGACY     0
+#define IAVF_AQ_ALTERNATE_MODE_BIOS_UEFI       1
+#define IAVF_AQ_ALTERNATE_RESET_NEEDED         2
        u8      reserved[14];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_alternate_write_done);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_alternate_write_done);
 
 /* Set OEM mode (direct 0x0905) */
-struct avf_aqc_alternate_set_mode {
+struct iavf_aqc_alternate_set_mode {
        __le32  mode;
-#define AVF_AQ_ALTERNATE_MODE_NONE     0
-#define AVF_AQ_ALTERNATE_MODE_OEM      1
+#define IAVF_AQ_ALTERNATE_MODE_NONE    0
+#define IAVF_AQ_ALTERNATE_MODE_OEM     1
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_alternate_set_mode);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_alternate_set_mode);
 
-/* Clear port Alternate RAM (direct 0x0906) uses avf_aq_desc */
+/* Clear port Alternate RAM (direct 0x0906) uses iavf_aq_desc */
 
 /* async events 0x10xx */
 
 /* Lan Queue Overflow Event (direct, 0x1001) */
-struct avf_aqc_lan_overflow {
+struct iavf_aqc_lan_overflow {
        __le32  prtdcb_rupto;
        __le32  otx_ctl;
        u8      reserved[8];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lan_overflow);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lan_overflow);
 
 /* Get LLDP MIB (indirect 0x0A00) */
-struct avf_aqc_lldp_get_mib {
+struct iavf_aqc_lldp_get_mib {
        u8      type;
        u8      reserved1;
-#define AVF_AQ_LLDP_MIB_TYPE_MASK              0x3
-#define AVF_AQ_LLDP_MIB_LOCAL                  0x0
-#define AVF_AQ_LLDP_MIB_REMOTE                 0x1
-#define AVF_AQ_LLDP_MIB_LOCAL_AND_REMOTE       0x2
-#define AVF_AQ_LLDP_BRIDGE_TYPE_MASK           0xC
-#define AVF_AQ_LLDP_BRIDGE_TYPE_SHIFT          0x2
-#define AVF_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE 0x0
-#define AVF_AQ_LLDP_BRIDGE_TYPE_NON_TPMR       0x1
-#define AVF_AQ_LLDP_TX_SHIFT                   0x4
-#define AVF_AQ_LLDP_TX_MASK                    (0x03 << AVF_AQ_LLDP_TX_SHIFT)
-/* TX pause flags use AVF_AQ_LINK_TX_* above */
+#define IAVF_AQ_LLDP_MIB_TYPE_MASK             0x3
+#define IAVF_AQ_LLDP_MIB_LOCAL                 0x0
+#define IAVF_AQ_LLDP_MIB_REMOTE                        0x1
+#define IAVF_AQ_LLDP_MIB_LOCAL_AND_REMOTE      0x2
+#define IAVF_AQ_LLDP_BRIDGE_TYPE_MASK          0xC
+#define IAVF_AQ_LLDP_BRIDGE_TYPE_SHIFT         0x2
+#define IAVF_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE        0x0
+#define IAVF_AQ_LLDP_BRIDGE_TYPE_NON_TPMR      0x1
+#define IAVF_AQ_LLDP_TX_SHIFT                  0x4
+#define IAVF_AQ_LLDP_TX_MASK                   (0x03 << IAVF_AQ_LLDP_TX_SHIFT)
+/* TX pause flags use IAVF_AQ_LINK_TX_* above */
        __le16  local_len;
        __le16  remote_len;
        u8      reserved2[2];
@@ -2419,26 +2419,26 @@ struct avf_aqc_lldp_get_mib {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_get_mib);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_get_mib);
 
 /* Configure LLDP MIB Change Event (direct 0x0A01)
  * also used for the event (with type in the command field)
  */
-struct avf_aqc_lldp_update_mib {
+struct iavf_aqc_lldp_update_mib {
        u8      command;
-#define AVF_AQ_LLDP_MIB_UPDATE_ENABLE  0x0
-#define AVF_AQ_LLDP_MIB_UPDATE_DISABLE 0x1
+#define IAVF_AQ_LLDP_MIB_UPDATE_ENABLE 0x0
+#define IAVF_AQ_LLDP_MIB_UPDATE_DISABLE        0x1
        u8      reserved[7];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_update_mib);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_update_mib);
 
 /* Add LLDP TLV (indirect 0x0A02)
  * Delete LLDP TLV (indirect 0x0A04)
  */
-struct avf_aqc_lldp_add_tlv {
+struct iavf_aqc_lldp_add_tlv {
        u8      type; /* only nearest bridge and non-TPMR from 0x0A00 */
        u8      reserved1[1];
        __le16  len;
@@ -2447,10 +2447,10 @@ struct avf_aqc_lldp_add_tlv {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_add_tlv);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_add_tlv);
 
 /* Update LLDP TLV (indirect 0x0A03) */
-struct avf_aqc_lldp_update_tlv {
+struct iavf_aqc_lldp_update_tlv {
        u8      type; /* only nearest bridge and non-TPMR from 0x0A00 */
        u8      reserved;
        __le16  old_len;
@@ -2460,65 +2460,65 @@ struct avf_aqc_lldp_update_tlv {
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_update_tlv);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_update_tlv);
 
 /* Stop LLDP (direct 0x0A05) */
-struct avf_aqc_lldp_stop {
+struct iavf_aqc_lldp_stop {
        u8      command;
-#define AVF_AQ_LLDP_AGENT_STOP         0x0
-#define AVF_AQ_LLDP_AGENT_SHUTDOWN     0x1
+#define IAVF_AQ_LLDP_AGENT_STOP                0x0
+#define IAVF_AQ_LLDP_AGENT_SHUTDOWN    0x1
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_stop);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_stop);
 
 /* Start LLDP (direct 0x0A06) */
 
-struct avf_aqc_lldp_start {
+struct iavf_aqc_lldp_start {
        u8      command;
-#define AVF_AQ_LLDP_AGENT_START        0x1
+#define IAVF_AQ_LLDP_AGENT_START       0x1
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_start);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_start);
 
 /* Set DCB (direct 0x0303) */
-struct avf_aqc_set_dcb_parameters {
+struct iavf_aqc_set_dcb_parameters {
        u8 command;
-#define AVF_AQ_DCB_SET_AGENT   0x1
-#define AVF_DCB_VALID          0x1
+#define IAVF_AQ_DCB_SET_AGENT  0x1
+#define IAVF_DCB_VALID         0x1
        u8 valid_flags;
        u8 reserved[14];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_set_dcb_parameters);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_set_dcb_parameters);
 
 /* Get CEE DCBX Oper Config (0x0A07)
  * uses the generic descriptor struct
  * returns below as indirect response
  */
 
-#define AVF_AQC_CEE_APP_FCOE_SHIFT     0x0
-#define AVF_AQC_CEE_APP_FCOE_MASK      (0x7 << AVF_AQC_CEE_APP_FCOE_SHIFT)
-#define AVF_AQC_CEE_APP_ISCSI_SHIFT    0x3
-#define AVF_AQC_CEE_APP_ISCSI_MASK     (0x7 << AVF_AQC_CEE_APP_ISCSI_SHIFT)
-#define AVF_AQC_CEE_APP_FIP_SHIFT      0x8
-#define AVF_AQC_CEE_APP_FIP_MASK       (0x7 << AVF_AQC_CEE_APP_FIP_SHIFT)
-
-#define AVF_AQC_CEE_PG_STATUS_SHIFT    0x0
-#define AVF_AQC_CEE_PG_STATUS_MASK     (0x7 << AVF_AQC_CEE_PG_STATUS_SHIFT)
-#define AVF_AQC_CEE_PFC_STATUS_SHIFT   0x3
-#define AVF_AQC_CEE_PFC_STATUS_MASK    (0x7 << AVF_AQC_CEE_PFC_STATUS_SHIFT)
-#define AVF_AQC_CEE_APP_STATUS_SHIFT   0x8
-#define AVF_AQC_CEE_APP_STATUS_MASK    (0x7 << AVF_AQC_CEE_APP_STATUS_SHIFT)
-#define AVF_AQC_CEE_FCOE_STATUS_SHIFT  0x8
-#define AVF_AQC_CEE_FCOE_STATUS_MASK   (0x7 << AVF_AQC_CEE_FCOE_STATUS_SHIFT)
-#define AVF_AQC_CEE_ISCSI_STATUS_SHIFT 0xB
-#define AVF_AQC_CEE_ISCSI_STATUS_MASK  (0x7 << AVF_AQC_CEE_ISCSI_STATUS_SHIFT)
-#define AVF_AQC_CEE_FIP_STATUS_SHIFT   0x10
-#define AVF_AQC_CEE_FIP_STATUS_MASK    (0x7 << AVF_AQC_CEE_FIP_STATUS_SHIFT)
-
-/* struct avf_aqc_get_cee_dcb_cfg_v1_resp was originally defined with
+#define IAVF_AQC_CEE_APP_FCOE_SHIFT    0x0
+#define IAVF_AQC_CEE_APP_FCOE_MASK     (0x7 << IAVF_AQC_CEE_APP_FCOE_SHIFT)
+#define IAVF_AQC_CEE_APP_ISCSI_SHIFT   0x3
+#define IAVF_AQC_CEE_APP_ISCSI_MASK    (0x7 << IAVF_AQC_CEE_APP_ISCSI_SHIFT)
+#define IAVF_AQC_CEE_APP_FIP_SHIFT     0x8
+#define IAVF_AQC_CEE_APP_FIP_MASK      (0x7 << IAVF_AQC_CEE_APP_FIP_SHIFT)
+
+#define IAVF_AQC_CEE_PG_STATUS_SHIFT   0x0
+#define IAVF_AQC_CEE_PG_STATUS_MASK    (0x7 << IAVF_AQC_CEE_PG_STATUS_SHIFT)
+#define IAVF_AQC_CEE_PFC_STATUS_SHIFT  0x3
+#define IAVF_AQC_CEE_PFC_STATUS_MASK   (0x7 << IAVF_AQC_CEE_PFC_STATUS_SHIFT)
+#define IAVF_AQC_CEE_APP_STATUS_SHIFT  0x8
+#define IAVF_AQC_CEE_APP_STATUS_MASK   (0x7 << IAVF_AQC_CEE_APP_STATUS_SHIFT)
+#define IAVF_AQC_CEE_FCOE_STATUS_SHIFT 0x8
+#define IAVF_AQC_CEE_FCOE_STATUS_MASK  (0x7 << IAVF_AQC_CEE_FCOE_STATUS_SHIFT)
+#define IAVF_AQC_CEE_ISCSI_STATUS_SHIFT        0xB
+#define IAVF_AQC_CEE_ISCSI_STATUS_MASK (0x7 << IAVF_AQC_CEE_ISCSI_STATUS_SHIFT)
+#define IAVF_AQC_CEE_FIP_STATUS_SHIFT  0x10
+#define IAVF_AQC_CEE_FIP_STATUS_MASK   (0x7 << IAVF_AQC_CEE_FIP_STATUS_SHIFT)
+
+/* struct iavf_aqc_get_cee_dcb_cfg_v1_resp was originally defined with
  * word boundary layout issues, which the Linux compilers silently deal
  * with by adding padding, making the actual struct larger than designed.
  * However, the FW compiler for the NIC is less lenient and complains
@@ -2526,7 +2526,7 @@ AVF_CHECK_CMD_LENGTH(avf_aqc_set_dcb_parameters);
  * fields reserved3 and reserved4 to directly acknowledge that padding,
  * and the new length is used in the length check macro.
  */
-struct avf_aqc_get_cee_dcb_cfg_v1_resp {
+struct iavf_aqc_get_cee_dcb_cfg_v1_resp {
        u8      reserved1;
        u8      oper_num_tc;
        u8      oper_prio_tc[4];
@@ -2539,9 +2539,9 @@ struct avf_aqc_get_cee_dcb_cfg_v1_resp {
        __le16  tlv_status;
 };
 
-AVF_CHECK_STRUCT_LEN(0x18, avf_aqc_get_cee_dcb_cfg_v1_resp);
+IAVF_CHECK_STRUCT_LEN(0x18, iavf_aqc_get_cee_dcb_cfg_v1_resp);
 
-struct avf_aqc_get_cee_dcb_cfg_resp {
+struct iavf_aqc_get_cee_dcb_cfg_resp {
        u8      oper_num_tc;
        u8      oper_prio_tc[4];
        u8      oper_tc_bw[8];
@@ -2551,12 +2551,12 @@ struct avf_aqc_get_cee_dcb_cfg_resp {
        u8      reserved[12];
 };
 
-AVF_CHECK_STRUCT_LEN(0x20, avf_aqc_get_cee_dcb_cfg_resp);
+IAVF_CHECK_STRUCT_LEN(0x20, iavf_aqc_get_cee_dcb_cfg_resp);
 
 /*     Set Local LLDP MIB (indirect 0x0A08)
  *     Used to replace the local MIB of a given LLDP agent. e.g. DCBx
  */
-struct avf_aqc_lldp_set_local_mib {
+struct iavf_aqc_lldp_set_local_mib {
 #define SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT       0
 #define SET_LOCAL_MIB_AC_TYPE_DCBX_MASK        (1 << \
                                        SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT)
@@ -2573,65 +2573,65 @@ struct avf_aqc_lldp_set_local_mib {
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_set_local_mib);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_set_local_mib);
 
-struct avf_aqc_lldp_set_local_mib_resp {
+struct iavf_aqc_lldp_set_local_mib_resp {
 #define SET_LOCAL_MIB_RESP_EVENT_TRIGGERED_MASK      0x01
        u8  status;
        u8  reserved[15];
 };
 
-AVF_CHECK_STRUCT_LEN(0x10, avf_aqc_lldp_set_local_mib_resp);
+IAVF_CHECK_STRUCT_LEN(0x10, iavf_aqc_lldp_set_local_mib_resp);
 
 /*     Stop/Start LLDP Agent (direct 0x0A09)
  *     Used for stopping/starting specific LLDP agent. e.g. DCBx
  */
-struct avf_aqc_lldp_stop_start_specific_agent {
-#define AVF_AQC_START_SPECIFIC_AGENT_SHIFT     0
-#define AVF_AQC_START_SPECIFIC_AGENT_MASK \
-                               (1 << AVF_AQC_START_SPECIFIC_AGENT_SHIFT)
+struct iavf_aqc_lldp_stop_start_specific_agent {
+#define IAVF_AQC_START_SPECIFIC_AGENT_SHIFT    0
+#define IAVF_AQC_START_SPECIFIC_AGENT_MASK \
+                               (1 << IAVF_AQC_START_SPECIFIC_AGENT_SHIFT)
        u8      command;
        u8      reserved[15];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_lldp_stop_start_specific_agent);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_lldp_stop_start_specific_agent);
 
 /* Add Udp Tunnel command and completion (direct 0x0B00) */
-struct avf_aqc_add_udp_tunnel {
+struct iavf_aqc_add_udp_tunnel {
        __le16  udp_port;
        u8      reserved0[3];
        u8      protocol_type;
-#define AVF_AQC_TUNNEL_TYPE_VXLAN      0x00
-#define AVF_AQC_TUNNEL_TYPE_NGE        0x01
-#define AVF_AQC_TUNNEL_TYPE_TEREDO     0x10
-#define AVF_AQC_TUNNEL_TYPE_VXLAN_GPE  0x11
+#define IAVF_AQC_TUNNEL_TYPE_VXLAN     0x00
+#define IAVF_AQC_TUNNEL_TYPE_NGE       0x01
+#define IAVF_AQC_TUNNEL_TYPE_TEREDO    0x10
+#define IAVF_AQC_TUNNEL_TYPE_VXLAN_GPE 0x11
        u8      reserved1[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_udp_tunnel);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_udp_tunnel);
 
-struct avf_aqc_add_udp_tunnel_completion {
+struct iavf_aqc_add_udp_tunnel_completion {
        __le16  udp_port;
        u8      filter_entry_index;
        u8      multiple_pfs;
-#define AVF_AQC_SINGLE_PF              0x0
-#define AVF_AQC_MULTIPLE_PFS           0x1
+#define IAVF_AQC_SINGLE_PF             0x0
+#define IAVF_AQC_MULTIPLE_PFS          0x1
        u8      total_filters;
        u8      reserved[11];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_add_udp_tunnel_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_add_udp_tunnel_completion);
 
 /* remove UDP Tunnel command (0x0B01) */
-struct avf_aqc_remove_udp_tunnel {
+struct iavf_aqc_remove_udp_tunnel {
        u8      reserved[2];
        u8      index; /* 0 to 15 */
        u8      reserved2[13];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_remove_udp_tunnel);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_remove_udp_tunnel);
 
-struct avf_aqc_del_udp_tunnel_completion {
+struct iavf_aqc_del_udp_tunnel_completion {
        __le16  udp_port;
        u8      index; /* 0 to 15 */
        u8      multiple_pfs;
@@ -2639,95 +2639,95 @@ struct avf_aqc_del_udp_tunnel_completion {
        u8      reserved1[11];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_del_udp_tunnel_completion);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_del_udp_tunnel_completion);
 
-struct avf_aqc_get_set_rss_key {
-#define AVF_AQC_SET_RSS_KEY_VSI_VALID          (0x1 << 15)
-#define AVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT       0
-#define AVF_AQC_SET_RSS_KEY_VSI_ID_MASK        (0x3FF << \
-                                       AVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT)
+struct iavf_aqc_get_set_rss_key {
+#define IAVF_AQC_SET_RSS_KEY_VSI_VALID         (0x1 << 15)
+#define IAVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT      0
+#define IAVF_AQC_SET_RSS_KEY_VSI_ID_MASK       (0x3FF << \
+                                       IAVF_AQC_SET_RSS_KEY_VSI_ID_SHIFT)
        __le16  vsi_id;
        u8      reserved[6];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_set_rss_key);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_set_rss_key);
 
-struct avf_aqc_get_set_rss_key_data {
+struct iavf_aqc_get_set_rss_key_data {
        u8 standard_rss_key[0x28];
        u8 extended_hash_key[0xc];
 };
 
-AVF_CHECK_STRUCT_LEN(0x34, avf_aqc_get_set_rss_key_data);
+IAVF_CHECK_STRUCT_LEN(0x34, iavf_aqc_get_set_rss_key_data);
 
-struct  avf_aqc_get_set_rss_lut {
-#define AVF_AQC_SET_RSS_LUT_VSI_VALID          (0x1 << 15)
-#define AVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT       0
-#define AVF_AQC_SET_RSS_LUT_VSI_ID_MASK        (0x3FF << \
-                                       AVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT)
+struct  iavf_aqc_get_set_rss_lut {
+#define IAVF_AQC_SET_RSS_LUT_VSI_VALID         (0x1 << 15)
+#define IAVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT      0
+#define IAVF_AQC_SET_RSS_LUT_VSI_ID_MASK       (0x3FF << \
+                                       IAVF_AQC_SET_RSS_LUT_VSI_ID_SHIFT)
        __le16  vsi_id;
-#define AVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT   0
-#define AVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK    (0x1 << \
-                                       AVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)
+#define IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT  0
+#define IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_MASK   (0x1 << \
+                                       IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)
 
-#define AVF_AQC_SET_RSS_LUT_TABLE_TYPE_VSI     0
-#define AVF_AQC_SET_RSS_LUT_TABLE_TYPE_PF      1
+#define IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_VSI    0
+#define IAVF_AQC_SET_RSS_LUT_TABLE_TYPE_PF     1
        __le16  flags;
        u8      reserved[4];
        __le32  addr_high;
        __le32  addr_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_get_set_rss_lut);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_get_set_rss_lut);
 
 /* tunnel key structure 0x0B10 */
 
-struct avf_aqc_tunnel_key_structure {
+struct iavf_aqc_tunnel_key_structure {
        u8      key1_off;
        u8      key2_off;
        u8      key1_len;  /* 0 to 15 */
        u8      key2_len;  /* 0 to 15 */
        u8      flags;
-#define AVF_AQC_TUNNEL_KEY_STRUCT_OVERRIDE     0x01
+#define IAVF_AQC_TUNNEL_KEY_STRUCT_OVERRIDE    0x01
 /* response flags */
-#define AVF_AQC_TUNNEL_KEY_STRUCT_SUCCESS      0x01
-#define AVF_AQC_TUNNEL_KEY_STRUCT_MODIFIED     0x02
-#define AVF_AQC_TUNNEL_KEY_STRUCT_OVERRIDDEN   0x03
+#define IAVF_AQC_TUNNEL_KEY_STRUCT_SUCCESS     0x01
+#define IAVF_AQC_TUNNEL_KEY_STRUCT_MODIFIED    0x02
+#define IAVF_AQC_TUNNEL_KEY_STRUCT_OVERRIDDEN  0x03
        u8      network_key_index;
-#define AVF_AQC_NETWORK_KEY_INDEX_VXLAN                0x0
-#define AVF_AQC_NETWORK_KEY_INDEX_NGE                  0x1
-#define AVF_AQC_NETWORK_KEY_INDEX_FLEX_MAC_IN_UDP      0x2
-#define AVF_AQC_NETWORK_KEY_INDEX_GRE                  0x3
+#define IAVF_AQC_NETWORK_KEY_INDEX_VXLAN               0x0
+#define IAVF_AQC_NETWORK_KEY_INDEX_NGE                 0x1
+#define IAVF_AQC_NETWORK_KEY_INDEX_FLEX_MAC_IN_UDP     0x2
+#define IAVF_AQC_NETWORK_KEY_INDEX_GRE                 0x3
        u8      reserved[10];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_tunnel_key_structure);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_tunnel_key_structure);
 
 /* OEM mode commands (direct 0xFE0x) */
-struct avf_aqc_oem_param_change {
+struct iavf_aqc_oem_param_change {
        __le32  param_type;
-#define AVF_AQ_OEM_PARAM_TYPE_PF_CTL   0
-#define AVF_AQ_OEM_PARAM_TYPE_BW_CTL   1
-#define AVF_AQ_OEM_PARAM_MAC           2
+#define IAVF_AQ_OEM_PARAM_TYPE_PF_CTL  0
+#define IAVF_AQ_OEM_PARAM_TYPE_BW_CTL  1
+#define IAVF_AQ_OEM_PARAM_MAC          2
        __le32  param_value1;
        __le16  param_value2;
        u8      reserved[6];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_oem_param_change);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_oem_param_change);
 
-struct avf_aqc_oem_state_change {
+struct iavf_aqc_oem_state_change {
        __le32  state;
-#define AVF_AQ_OEM_STATE_LINK_DOWN     0x0
-#define AVF_AQ_OEM_STATE_LINK_UP       0x1
+#define IAVF_AQ_OEM_STATE_LINK_DOWN    0x0
+#define IAVF_AQ_OEM_STATE_LINK_UP      0x1
        u8      reserved[12];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_oem_state_change);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_oem_state_change);
 
 /* Initialize OCSD (0xFE02, direct) */
-struct avf_aqc_opc_oem_ocsd_initialize {
+struct iavf_aqc_opc_oem_ocsd_initialize {
        u8 type_status;
        u8 reserved1[3];
        __le32 ocsd_memory_block_addr_high;
@@ -2735,10 +2735,10 @@ struct avf_aqc_opc_oem_ocsd_initialize {
        __le32 requested_update_interval;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_opc_oem_ocsd_initialize);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_opc_oem_ocsd_initialize);
 
 /* Initialize OCBB  (0xFE03, direct) */
-struct avf_aqc_opc_oem_ocbb_initialize {
+struct iavf_aqc_opc_oem_ocbb_initialize {
        u8 type_status;
        u8 reserved1[3];
        __le32 ocbb_memory_block_addr_high;
@@ -2746,7 +2746,7 @@ struct avf_aqc_opc_oem_ocbb_initialize {
        u8 reserved2[4];
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_opc_oem_ocbb_initialize);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_opc_oem_ocbb_initialize);
 
 /* debug commands */
 
@@ -2754,71 +2754,71 @@ AVF_CHECK_CMD_LENGTH(avf_aqc_opc_oem_ocbb_initialize);
 
 /* set test more (0xFF01, internal) */
 
-struct avf_acq_set_test_mode {
+struct iavf_acq_set_test_mode {
        u8      mode;
-#define AVF_AQ_TEST_PARTIAL    0
-#define AVF_AQ_TEST_FULL       1
-#define AVF_AQ_TEST_NVM        2
+#define IAVF_AQ_TEST_PARTIAL   0
+#define IAVF_AQ_TEST_FULL      1
+#define IAVF_AQ_TEST_NVM       2
        u8      reserved[3];
        u8      command;
-#define AVF_AQ_TEST_OPEN       0
-#define AVF_AQ_TEST_CLOSE      1
-#define AVF_AQ_TEST_INC        2
+#define IAVF_AQ_TEST_OPEN      0
+#define IAVF_AQ_TEST_CLOSE     1
+#define IAVF_AQ_TEST_INC       2
        u8      reserved2[3];
        __le32  address_high;
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_acq_set_test_mode);
+IAVF_CHECK_CMD_LENGTH(iavf_acq_set_test_mode);
 
 /* Debug Read Register command (0xFF03)
  * Debug Write Register command (0xFF04)
  */
-struct avf_aqc_debug_reg_read_write {
+struct iavf_aqc_debug_reg_read_write {
        __le32 reserved;
        __le32 address;
        __le32 value_high;
        __le32 value_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_debug_reg_read_write);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_debug_reg_read_write);
 
 /* Scatter/gather Reg Read  (indirect 0xFF05)
  * Scatter/gather Reg Write (indirect 0xFF06)
  */
 
-/* avf_aq_desc is used for the command */
-struct avf_aqc_debug_reg_sg_element_data {
+/* iavf_aq_desc is used for the command */
+struct iavf_aqc_debug_reg_sg_element_data {
        __le32 address;
        __le32 value;
 };
 
 /* Debug Modify register (direct 0xFF07) */
-struct avf_aqc_debug_modify_reg {
+struct iavf_aqc_debug_modify_reg {
        __le32 address;
        __le32 value;
        __le32 clear_mask;
        __le32 set_mask;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_debug_modify_reg);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_debug_modify_reg);
 
 /* dump internal data (0xFF08, indirect) */
 
-#define AVF_AQ_CLUSTER_ID_AUX          0
-#define AVF_AQ_CLUSTER_ID_SWITCH_FLU   1
-#define AVF_AQ_CLUSTER_ID_TXSCHED      2
-#define AVF_AQ_CLUSTER_ID_HMC          3
-#define AVF_AQ_CLUSTER_ID_MAC0         4
-#define AVF_AQ_CLUSTER_ID_MAC1         5
-#define AVF_AQ_CLUSTER_ID_MAC2         6
-#define AVF_AQ_CLUSTER_ID_MAC3         7
-#define AVF_AQ_CLUSTER_ID_DCB          8
-#define AVF_AQ_CLUSTER_ID_EMP_MEM      9
-#define AVF_AQ_CLUSTER_ID_PKT_BUF      10
-#define AVF_AQ_CLUSTER_ID_ALTRAM       11
-
-struct avf_aqc_debug_dump_internals {
+#define IAVF_AQ_CLUSTER_ID_AUX         0
+#define IAVF_AQ_CLUSTER_ID_SWITCH_FLU  1
+#define IAVF_AQ_CLUSTER_ID_TXSCHED     2
+#define IAVF_AQ_CLUSTER_ID_HMC         3
+#define IAVF_AQ_CLUSTER_ID_MAC0                4
+#define IAVF_AQ_CLUSTER_ID_MAC1                5
+#define IAVF_AQ_CLUSTER_ID_MAC2                6
+#define IAVF_AQ_CLUSTER_ID_MAC3                7
+#define IAVF_AQ_CLUSTER_ID_DCB         8
+#define IAVF_AQ_CLUSTER_ID_EMP_MEM     9
+#define IAVF_AQ_CLUSTER_ID_PKT_BUF     10
+#define IAVF_AQ_CLUSTER_ID_ALTRAM      11
+
+struct iavf_aqc_debug_dump_internals {
        u8      cluster_id;
        u8      table_id;
        __le16  data_size;
@@ -2827,15 +2827,15 @@ struct avf_aqc_debug_dump_internals {
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_debug_dump_internals);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_debug_dump_internals);
 
-struct avf_aqc_debug_modify_internals {
+struct iavf_aqc_debug_modify_internals {
        u8      cluster_id;
        u8      cluster_specific_params[7];
        __le32  address_high;
        __le32  address_low;
 };
 
-AVF_CHECK_CMD_LENGTH(avf_aqc_debug_modify_internals);
+IAVF_CHECK_CMD_LENGTH(iavf_aqc_debug_modify_internals);
 
-#endif /* _AVF_ADMINQ_CMD_H_ */
+#endif /* _IAVF_ADMINQ_CMD_H_ */