[dpdk-stable] [patch v1] net/i40e: fix the compile issue

[Gavin Hu]

Using gcc version 4.8.5 20150623 (Red Hat 4.8.5-28), it reports the
following compiling error:

/download/dpdk/drivers/net/i40e/i40e_rxtx_vec_neon.c:175:65: error:
expected ';', ',' or ')' before 'rx_pkts' desc_to_ptype_v(uint64x2_t
descs[4], struct rte_mbuf **restrict rx_pkts, ^
/download/dpdk/drivers/net/i40e/i40e_rxtx_vec_neon.c:197:51: error:
expected ';', ',' or ')' before 'rxq' _recv_raw_pkts_vec(struct
i40e_rx_queue *restrict rxq, struct rte_mbuf ^
/download/dpdk/drivers/net/i40e/i40e_rxtx_vec_neon.c:435:35: error:
expected ';', ',' or ')' before 'rx_queue' i40e_recv_pkts_vec(void
*restrict rx_queue, struct rte_mbuf **restrict rx_pkts,

Fix this by using '__restrict' type qualifier, which compiles ok with
old and new versions of gcc.

Fixes: 8499b1748f26 ("net/i40e: restrict pointer aliasing for NEON")
Cc: stable at dpdk.org

Signed-off-by: Gavin Hu <gavin.hu at arm.com>
---
 drivers/net/i40e/i40e_rxtx_vec_neon.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 258b42e4d..1dfd0478b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -172,8 +172,8 @@ desc_to_olflags_v(struct i40e_rx_queue *rxq, uint64x2_t descs[4],
 #define I40E_UINT16_BIT (CHAR_BIT * sizeof(uint16_t))
 
 static inline void
-desc_to_ptype_v(uint64x2_t descs[4], struct rte_mbuf **restrict rx_pkts,
-		uint32_t *restrict ptype_tbl)
+desc_to_ptype_v(uint64x2_t descs[4], struct rte_mbuf **__restrict rx_pkts,
+		uint32_t *__restrict ptype_tbl)
 {
 	int i;
 	uint8_t ptype;
@@ -194,8 +194,8 @@ desc_to_ptype_v(uint64x2_t descs[4], struct rte_mbuf **restrict rx_pkts,
  *   numbers of DD bits
  */
 static inline uint16_t
-_recv_raw_pkts_vec(struct i40e_rx_queue *restrict rxq, struct rte_mbuf
-	**restrict rx_pkts, uint16_t nb_pkts, uint8_t *split_packet)
+_recv_raw_pkts_vec(struct i40e_rx_queue *__restrict rxq, struct rte_mbuf
+	**__restrict rx_pkts, uint16_t nb_pkts, uint8_t *split_packet)
 {
 	volatile union i40e_rx_desc *rxdp;
 	struct i40e_rx_entry *sw_ring;
@@ -432,8 +432,8 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *restrict rxq, struct rte_mbuf
  *   numbers of DD bits
  */
 uint16_t
-i40e_recv_pkts_vec(void *restrict rx_queue, struct rte_mbuf **restrict rx_pkts,
-		   uint16_t nb_pkts)
+i40e_recv_pkts_vec(void *__restrict rx_queue,
+		struct rte_mbuf **__restrict rx_pkts, uint16_t nb_pkts)
 {
 	return _recv_raw_pkts_vec(rx_queue, rx_pkts, nb_pkts, NULL);
 }
@@ -504,8 +504,8 @@ vtx(volatile struct i40e_tx_desc *txdp, struct rte_mbuf **pkt,
 }
 
 uint16_t
-i40e_xmit_fixed_burst_vec(void *restrict tx_queue,
-	struct rte_mbuf **restrict tx_pkts, uint16_t nb_pkts)
+i40e_xmit_fixed_burst_vec(void *__restrict tx_queue,
+	struct rte_mbuf **__restrict tx_pkts, uint16_t nb_pkts)
 {
 	struct i40e_tx_queue *txq = (struct i40e_tx_queue *)tx_queue;
 	volatile struct i40e_tx_desc *txdp;
-- 
2.17.1