net: add rte prefix to ether structures

[dpdk.git] / drivers / net / atlantic / hw_atl / hw_atl_utils_fw2x.c

diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
index e07ed5e..55b5ce3 100644 (file)
--- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
+++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
@@ -34,7 +34,6 @@
 #define HAL_ATLANTIC_WOL_FILTERS_COUNT     8
 #define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL    0x0E
 
-#define HW_ATL_FW_FEATURE_EEPROM 0x03010025
 #define HW_ATL_FW_FEATURE_LED 0x03010026
 
 struct fw2x_msg_wol_pattern {
@@ -229,8 +228,8 @@ int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)
                mac_addr[1] = rte_constant_bswap32(mac_addr[1]);
        }
 
-       ether_addr_copy((struct ether_addr *)mac_addr,
-                       (struct ether_addr *)mac);
+       ether_addr_copy((struct rte_ether_addr *)mac_addr,
+                       (struct rte_ether_addr *)mac);
 
        if ((mac[0] & 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {
                unsigned int rnd = (uint32_t)rte_rand();
@@ -513,7 +512,7 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr,
        u32 mpi_opts;
        int err = 0;
 
-       if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM)
+       if ((self->caps_lo & BIT(CAPS_LO_SMBUS_READ)) == 0)
                return -EOPNOTSUPP;
 
        request.msg_id = 0;
@@ -591,7 +590,7 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr,
        u32 mpi_opts, result = 0;
        int err = 0;
 
-       if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM)
+       if ((self->caps_lo & BIT(CAPS_LO_SMBUS_WRITE)) == 0)
                return -EOPNOTSUPP;
 
        request.msg_id = 0;
@@ -672,7 +671,7 @@ static int aq_fw2x_send_macsec_request(struct aq_hw_s *self,
        int err = 0;
        u32 mpi_opts = 0;
 
-       if (!response || !response)
+       if (!req || !response)
                return 0;
 
        if ((self->caps_lo & BIT(CAPS_LO_MACSEC)) == 0)