Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lwip: enable LWIP_SO_RCVTIMEO if sock layer is used #17779

Merged
merged 2 commits into from
Mar 10, 2022
Merged

lwip: enable LWIP_SO_RCVTIMEO if sock layer is used #17779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dffb785
lwip: enable LWIP_SO_RCVTIMEO if sock layer is used
benpicco Mar 9, 2022
eb45c72
tests/lwip_sock_*: drop LWIP_SO_RCVTIMEO
benpicco Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/lwip/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ endif

ifneq (,$(filter lwip_sock_%,$(USEMODULE)))
USEMODULE += lwip_sock
CFLAGS += -DLWIP_SO_RCVTIMEO
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would preferred this switch to be in pkg/lwip/include/lwipopts.h. Could this maybe be done as a follow-up?

endif

ifneq (,$(filter lwip_sock_ip,$(USEMODULE)))
Expand Down
1 change: 0 additions & 1 deletion tests/lwip_sock_ip/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ USEMODULE += sock_ip
DISABLE_MODULE += auto_init_lwip

CFLAGS += -DSO_REUSE
CFLAGS += -DLWIP_SO_RCVTIMEO

include $(RIOTBASE)/Makefile.include
1 change: 0 additions & 1 deletion tests/lwip_sock_tcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/lwip_sock_udp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ USEMODULE += sock_udp
DISABLE_MODULE += auto_init_lwip

CFLAGS += -DSO_REUSE
CFLAGS += -DLWIP_SO_RCVTIMEO

include $(RIOTBASE)/Makefile.include