net/cnxk: support Rx security offload on cn10k

[dpdk.git] / drivers / net / bnx2x / bnx2x.c

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 7ee805b..083deff 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2233,8 +2233,8 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
 
                tx_parse_bd =
                    &txq->tx_ring[TX_BD(bd_prod, txq)].parse_bd_e2;
-               if (rte_is_multicast_ether_addr(&eh->d_addr)) {
-                       if (rte_is_broadcast_ether_addr(&eh->d_addr))
+               if (rte_is_multicast_ether_addr(&eh->dst_addr)) {
+                       if (rte_is_broadcast_ether_addr(&eh->dst_addr))
                                mac_type = BROADCAST_ADDRESS;
                        else
                                mac_type = MULTICAST_ADDRESS;
@@ -2243,17 +2243,17 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf *m0)
                    (mac_type << ETH_TX_PARSE_BD_E2_ETH_ADDR_TYPE_SHIFT);
 
                rte_memcpy(&tx_parse_bd->data.mac_addr.dst_hi,
-                          &eh->d_addr.addr_bytes[0], 2);
+                          &eh->dst_addr.addr_bytes[0], 2);
                rte_memcpy(&tx_parse_bd->data.mac_addr.dst_mid,
-                          &eh->d_addr.addr_bytes[2], 2);
+                          &eh->dst_addr.addr_bytes[2], 2);
                rte_memcpy(&tx_parse_bd->data.mac_addr.dst_lo,
-                          &eh->d_addr.addr_bytes[4], 2);
+                          &eh->dst_addr.addr_bytes[4], 2);
                rte_memcpy(&tx_parse_bd->data.mac_addr.src_hi,
-                          &eh->s_addr.addr_bytes[0], 2);
+                          &eh->src_addr.addr_bytes[0], 2);
                rte_memcpy(&tx_parse_bd->data.mac_addr.src_mid,
-                          &eh->s_addr.addr_bytes[2], 2);
+                          &eh->src_addr.addr_bytes[2], 2);
                rte_memcpy(&tx_parse_bd->data.mac_addr.src_lo,
-                          &eh->s_addr.addr_bytes[4], 2);
+                          &eh->src_addr.addr_bytes[4], 2);
 
                tx_parse_bd->data.mac_addr.dst_hi =
                    rte_cpu_to_be_16(tx_parse_bd->data.mac_addr.dst_hi);
@@ -8176,7 +8176,7 @@ static int bnx2x_get_shmem_info(struct bnx2x_softc *sc)
                sc->link_params.mac_addr[4] = (uint8_t) (mac_lo >> 8);
                sc->link_params.mac_addr[5] = (uint8_t) (mac_lo);
                snprintf(sc->mac_addr_str, sizeof(sc->mac_addr_str),
-                        "%02x:%02x:%02x:%02x:%02x:%02x",
+                        RTE_ETHER_ADDR_PRT_FMT,
                         sc->link_params.mac_addr[0],
                         sc->link_params.mac_addr[1],
                         sc->link_params.mac_addr[2],
@@ -11894,7 +11894,7 @@ void bnx2x_print_device_info(struct bnx2x_softc *sc)
        PMD_DRV_LOG(INFO, sc, "%12s : %u", "MTU", sc->mtu);
        PMD_DRV_LOG(INFO, sc,
                    "%12s : %s", "PHY Type", get_ext_phy_type(ext_phy_type));
-       PMD_DRV_LOG(INFO, sc, "%12s : %x:%x:%x:%x:%x:%x", "MAC Addr",
+       PMD_DRV_LOG(INFO, sc, "%12s : " RTE_ETHER_ADDR_PRT_FMT, "MAC Addr",
                        sc->link_params.mac_addr[0],
                        sc->link_params.mac_addr[1],
                        sc->link_params.mac_addr[2],