From ba9eebbb60287100a331eccfefe860301993328e Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 1 Jul 2016 10:02:27 +0200 Subject: [PATCH] net/ixgbe: fix build whith offload flags disabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ixgbe driver does not compile if CONFIG_RTE_IXGBE_RX_OLFLAGS_ENABLE=n because the macro has not the proper number of parameters. To reproduce the issue: make config T=x86_64-native-linuxapp-gcc sed -i 's,\(IXGBE_RX_OLFLAGS_ENABLE\)=y,\1=n,' build/.config make -j4 [...] ixgbe_rxtx_vec_sse.c: In function ‘_recv_raw_pkts_vec’: ixgbe_rxtx_vec_sse.c:345:53: error: macro "desc_to_olflags_v" passed 3 arguments, but takes just 2 desc_to_olflags_v(descs, vlan_flags, &rx_pkts[pos]); ^ ixgbe_rxtx_vec_sse.c:345:3: error: ‘desc_to_olflags_v’ undeclared (first use in this function) desc_to_olflags_v(descs, vlan_flags, &rx_pkts[pos]); ^ ixgbe_rxtx_vec_sse.c:231:10: error: variable ‘vlan_flags’ set but not used uint8_t vlan_flags; ^ This patch fixes the number of arguments in the macro, and ensures that vlan_flags is marked as used to avoid the third error. Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN") Reported-by: Amin Tootoonchian Signed-off-by: Olivier Matz Acked-by: Konstantin Ananyev --- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c index 4f95debd38..1c4fd7c154 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c @@ -197,7 +197,9 @@ desc_to_olflags_v(__m128i descs[4], uint8_t vlan_flags, rx_pkts[3]->ol_flags = vol.e[3]; } #else -#define desc_to_olflags_v(desc, rx_pkts) do {} while (0) +#define desc_to_olflags_v(desc, vlan_flags, rx_pkts) do { \ + RTE_SET_USED(vlan_flags); \ + } while (0) #endif /* -- 2.20.1