Merge pull request #17779 from benpicco/LWIP_SO_RCVTIMEO

lwip: enable LWIP_SO_RCVTIMEO if sock layer is used
RIOT-OS · Mar 10, 2022 · ddf8f67 · ddf8f67
2 parents 8fa2687 + eb45c72
commit ddf8f67
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 3 deletions.
diff --git a/pkg/lwip/Makefile.dep b/pkg/lwip/Makefile.dep
@@ -42,6 +42,7 @@ endif
 
 ifneq (,$(filter lwip_sock_%,$(USEMODULE)))
  USEMODULE += lwip_sock
+ CFLAGS += -DLWIP_SO_RCVTIMEO
 endif
 
 ifneq (,$(filter lwip_sock_ip,$(USEMODULE)))

diff --git a/tests/lwip_sock_ip/Makefile b/tests/lwip_sock_ip/Makefile
@@ -31,6 +31,5 @@ USEMODULE += sock_ip
 DISABLE_MODULE += auto_init_lwip
 
 CFLAGS += -DSO_REUSE
-CFLAGS += -DLWIP_SO_RCVTIMEO
 
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/lwip_sock_tcp/Makefile b/tests/lwip_sock_tcp/Makefile
@@ -25,7 +25,6 @@ USEMODULE += sock_tcp
 DISABLE_MODULE += auto_init_lwip
 
 CFLAGS += -DSO_REUSE
-CFLAGS += -DLWIP_SO_RCVTIMEO
 CFLAGS += -DLWIP_SOCK_TCP_ACCEPT_TIMEOUT=500
 CFLAGS += -DLWIP_NETIF_LOOPBACK=1
 CFLAGS += -DLWIP_HAVE_LOOPIF=1

diff --git a/tests/lwip_sock_udp/Makefile b/tests/lwip_sock_udp/Makefile
@@ -31,6 +31,5 @@ USEMODULE += sock_udp
 DISABLE_MODULE += auto_init_lwip
 
 CFLAGS += -DSO_REUSE
-CFLAGS += -DLWIP_SO_RCVTIMEO
 
 include $(RIOTBASE)/Makefile.include