From 764343ebc7339e57a82826a42244464fc241dfbc Mon Sep 17 00:00:00 2001 From: Sylvain Rochet Date: Thu, 21 Jul 2016 13:47:40 +0200 Subject: [PATCH] Revert "PPP: restore PPPoE devices without Ethernet ARP support, i.e. PPPoE only devices" This reverts commit d43c092f171e683028e184af56333dab9ce79fcb. We don't actually need it, init.c is including ppp_opts.h and is doing the following: #if !LWIP_ETHERNET && (LWIP_ARP || PPPOE_SUPPORT) #error "LWIP_ETHERNET needs to be turned on for LWIP_ARP or PPPOE_SUPPORT" #endif so the LWIP_ETHERNET fixup is not necessary per se, compatibility with previously used lwipopts.h files is broken but at least user is warned. --- src/include/netif/ppp/ppp_opts.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/include/netif/ppp/ppp_opts.h b/src/include/netif/ppp/ppp_opts.h index 4d379a92..75541f44 100644 --- a/src/include/netif/ppp/ppp_opts.h +++ b/src/include/netif/ppp/ppp_opts.h @@ -43,11 +43,6 @@ #ifndef PPPOE_SUPPORT #define PPPOE_SUPPORT 0 #endif -#if PPPOE_SUPPORT -/* PPPoE requires Ethernet support */ -#undef LWIP_ETHERNET -#define LWIP_ETHERNET 1 -#endif /* PPPOE_SUPPORT */ /** * PPPOL2TP_SUPPORT==1: Enable PPP Over L2TP