From: Chas Williams <3chas3@gmail.com>
Date: Wed, 18 Nov 2015 20:58:41 +0000 (-0500)
Subject: bnx2x: set ethernet address type during VF Tx
X-Git-Tag: spdx-start~7875
X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=6c6a6e337d482e0d60e66d9e688600a0a250b409

bnx2x: set ethernet address type during VF Tx

The original was always setting unicast.  While here, clean up some
other references that also point into the Ethernet header.

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Harish Patil <harish.patil@qlogic.com>
---

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 76444eb2ae..294711fbb2 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -2177,25 +2177,32 @@ int bnx2x_tx_encap(struct bnx2x_tx_queue *txq, struct rte_mbuf **m_head, int m_p
 		bd_prod = NEXT_TX_BD(bd_prod);
 		if (IS_VF(sc)) {
 			struct eth_tx_parse_bd_e2 *tx_parse_bd;
-			uint8_t *data = rte_pktmbuf_mtod(m0, uint8_t *);
+			const struct ether_hdr *eh = rte_pktmbuf_mtod(m0, struct ether_hdr *);
+			uint8_t mac_type = UNICAST_ADDRESS;
 
 			tx_parse_bd =
 			    &txq->tx_ring[TX_BD(bd_prod, txq)].parse_bd_e2;
+			if (is_multicast_ether_addr(&eh->d_addr)) {
+				if (is_broadcast_ether_addr(&eh->d_addr))
+					mac_type = BROADCAST_ADDRESS;
+				else
+					mac_type = MULTICAST_ADDRESS;
+			}
 			tx_parse_bd->parsing_data =
-			    (1 << ETH_TX_PARSE_BD_E2_ETH_ADDR_TYPE_SHIFT);
+			    (mac_type << ETH_TX_PARSE_BD_E2_ETH_ADDR_TYPE_SHIFT);
 
 			rte_memcpy(&tx_parse_bd->data.mac_addr.dst_hi,
-				   &data[0], 2);
+				   &eh->d_addr.addr_bytes[0], 2);
 			rte_memcpy(&tx_parse_bd->data.mac_addr.dst_mid,
-				   &data[2], 2);
+				   &eh->d_addr.addr_bytes[2], 2);
 			rte_memcpy(&tx_parse_bd->data.mac_addr.dst_lo,
-				   &data[4], 2);
+				   &eh->d_addr.addr_bytes[4], 2);
 			rte_memcpy(&tx_parse_bd->data.mac_addr.src_hi,
-				   &data[6], 2);
+				   &eh->s_addr.addr_bytes[0], 2);
 			rte_memcpy(&tx_parse_bd->data.mac_addr.src_mid,
-				   &data[8], 2);
+				   &eh->s_addr.addr_bytes[2], 2);
 			rte_memcpy(&tx_parse_bd->data.mac_addr.src_lo,
-				   &data[10], 2);
+				   &eh->s_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);
diff --git a/drivers/net/bnx2x/ecore_hsi.h b/drivers/net/bnx2x/ecore_hsi.h
index a4ed9b5771..6c11c5a386 100644
--- a/drivers/net/bnx2x/ecore_hsi.h
+++ b/drivers/net/bnx2x/ecore_hsi.h
@@ -4029,7 +4029,7 @@ struct double_regpair
 
 
 /*
- * Ethernet address typesm used in ethernet tx BDs
+ * Ethernet address types used in ethernet tx BDs
  */
 enum eth_addr_type
 {
@@ -4037,7 +4037,8 @@ enum eth_addr_type
 	UNICAST_ADDRESS,
 	MULTICAST_ADDRESS,
 	BROADCAST_ADDRESS,
-	MAX_ETH_ADDR_TYPE};
+	MAX_ETH_ADDR_TYPE
+};
 
 
 /*