X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fmacswap_sse.h;h=223f87a53946fca3985c45eafd6cbd00e1f1d0b1;hb=d70a869db27871db90f86e108fdbb9a22fc6d8c7;hp=662fe79cf9298042cb8d8e2e13f053dbcac97fff;hpb=cc28a6907b228d55f02bfbf0a40498db0a22ea62;p=dpdk.git

diff --git a/app/test-pmd/macswap_sse.h b/app/test-pmd/macswap_sse.h
index 662fe79cf9..223f87a539 100644
--- a/app/test-pmd/macswap_sse.h
+++ b/app/test-pmd/macswap_sse.h
@@ -11,7 +11,7 @@ static inline void
 do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
 		struct rte_port *txp)
 {
-	struct ether_hdr *eth_hdr[4];
+	struct rte_ether_hdr *eth_hdr[4];
 	struct rte_mbuf *mb[4];
 	uint64_t ol_flags;
 	int i;
@@ -35,21 +35,28 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
 	r = nb;
 
 	while (r >= 4) {
+		if (r >= 8) {
+			rte_prefetch0(rte_pktmbuf_mtod(pkts[i + 4], void *));
+			rte_prefetch0(rte_pktmbuf_mtod(pkts[i + 5], void *));
+			rte_prefetch0(rte_pktmbuf_mtod(pkts[i + 6], void *));
+			rte_prefetch0(rte_pktmbuf_mtod(pkts[i + 7], void *));
+		}
+
 		mb[0] = pkts[i++];
-		eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct ether_hdr *);
+		eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct rte_ether_hdr *);
 		addr0 = _mm_loadu_si128((__m128i *)eth_hdr[0]);
 
 		mb[1] = pkts[i++];
-		eth_hdr[1] = rte_pktmbuf_mtod(mb[1], struct ether_hdr *);
+		eth_hdr[1] = rte_pktmbuf_mtod(mb[1], struct rte_ether_hdr *);
 		addr1 = _mm_loadu_si128((__m128i *)eth_hdr[1]);
 
 
 		mb[2] = pkts[i++];
-		eth_hdr[2] = rte_pktmbuf_mtod(mb[2], struct ether_hdr *);
+		eth_hdr[2] = rte_pktmbuf_mtod(mb[2], struct rte_ether_hdr *);
 		addr2 = _mm_loadu_si128((__m128i *)eth_hdr[2]);
 
 		mb[3] = pkts[i++];
-		eth_hdr[3] = rte_pktmbuf_mtod(mb[3], struct ether_hdr *);
+		eth_hdr[3] = rte_pktmbuf_mtod(mb[3], struct rte_ether_hdr *);
 		addr3 = _mm_loadu_si128((__m128i *)eth_hdr[3]);
 
 		addr0 = _mm_shuffle_epi8(addr0, shfl_msk);
@@ -73,7 +80,7 @@ do_macswap(struct rte_mbuf *pkts[], uint16_t nb,
 		if (i < nb - 1)
 			rte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void *));
 		mb[0] = pkts[i];
-		eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct ether_hdr *);
+		eth_hdr[0] = rte_pktmbuf_mtod(mb[0], struct rte_ether_hdr *);
 
 		/* Swap dest and src mac addresses. */
 		addr0 = _mm_loadu_si128((__m128i *)eth_hdr[0]);