Skip to content

pkg/lwip: Use IS_ACTIVE() and bugfix [backport 2020.07] #14671

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
Merged
merged 2 commits into from
Jul 31, 2020
Merged

pkg/lwip: Use IS_ACTIVE() and bugfix [backport 2020.07] #14671

merged 2 commits into from
Jul 31, 2020

Conversation

maribu
Copy link
Member

@maribu maribu commented Jul 31, 2020

Backport of #14665

Contribution description

  • Changed some code to use IS_ACTIVE() over #if/#ifdef
  • Fixed family in sock_udp_get_local()

Testing procedure

  • No regressions in lwip
  • LWIP_IPV4=1 LWIP_IPV6=1 make -C tests/lwip_sock_udp flash test should no pass

Issues/PRs references

Split out of #14622

@maribu maribu requested a review from miri64 as a code owner July 31, 2020 13:34
@maribu maribu added Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Jul 31, 2020
@maribu maribu mentioned this pull request Jul 31, 2020
Merged
miri64
miri64 previously approved these changes Jul 31, 2020
View reviewed changes
Copy link
Member

@miri64 miri64 left a comment

Choose a reason for hiding this comment

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

ACK, change is identical to #14665

@miri64
Copy link
Member

miri64 commented Jul 31, 2020

Needs rebase to release branch.

maribu added 2 commits July 31, 2020 17:50
@maribu
pkg/lwip: Compatibility with IS_USED()
3dff0b9 
The `IS_USED()` macro doesn't work if macros are defined to `(1)` instead of `1`

(cherry picked from commit 5be2d08)
@maribu
pkg/lwip: Use IS_ACTIVE() & NETCONNTYPE_ISIPV6()
957518f 
This also fixes an issue detected by `tests/lwip_sock_udp` when both IPv4 and
IPv6 are enabled.

(cherry picked from commit 00c44b0)
@maribu maribu force-pushed the backport/2020.07/pkg_lwip branch from 6bfad57 to 957518f Compare July 31, 2020 15:50
miri64
miri64 approved these changes Jul 31, 2020
View reviewed changes
Copy link
Member

@miri64 miri64 left a comment

Choose a reason for hiding this comment

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

Re-ACK

@miri64 miri64 merged commit 2d0180a into RIOT-OS:2020.07-branch Jul 31, 2020
@maribu maribu deleted the backport/2020.07/pkg_lwip branch July 31, 2020 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miri64 miri64 miri64 approved these changes

Assignees
No one assigned
Labels
Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maribu @miri64