From f72227aadcc1d0d8c46a8b4fe62ba3d03ffa42c3 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Wed, 7 Nov 2018 10:49:06 +0100 Subject: [PATCH] fix compiling ETHARP_SUPPORT_VLAN without LWIP_HOOK_VLAN_SET and LWIP_VLAN_PCP --- src/netif/ethernet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/netif/ethernet.c b/src/netif/ethernet.c index 9e367f8c..6db434b4 100644 --- a/src/netif/ethernet.c +++ b/src/netif/ethernet.c @@ -273,7 +273,7 @@ ethernet_output(struct netif * netif, struct pbuf * p, struct eth_hdr *ethhdr; u16_t eth_type_be = lwip_htons(eth_type); -#if ETHARP_SUPPORT_VLAN +#if ETHARP_SUPPORT_VLAN && (defined(LWIP_HOOK_VLAN_SET) || LWIP_VLAN_PCP) s32_t vlan_prio_vid; #ifdef LWIP_HOOK_VLAN_SET vlan_prio_vid = LWIP_HOOK_VLAN_SET(netif, p, src, dst, eth_type); @@ -297,7 +297,7 @@ ethernet_output(struct netif * netif, struct pbuf * p, eth_type_be = PP_HTONS(ETHTYPE_VLAN); } else -#endif /* ETHARP_SUPPORT_VLAN && defined(LWIP_HOOK_VLAN_SET) */ +#endif /* ETHARP_SUPPORT_VLAN && (defined(LWIP_HOOK_VLAN_SET) || LWIP_VLAN_PCP) */ { if (pbuf_add_header(p, SIZEOF_ETH_HDR) != 0) { goto pbuf_header_failed;