Kconfig: Expose gnrc/ipv6/ext/frag configurations#12958
Merged
cgundogan merged 5 commits intoRIOT-OS:masterfrom Jan 30, 2020
Merged
Kconfig: Expose gnrc/ipv6/ext/frag configurations#12958cgundogan merged 5 commits intoRIOT-OS:masterfrom
cgundogan merged 5 commits intoRIOT-OS:masterfrom
Conversation
71 tasks
miri64
requested changes
Dec 16, 2019
e8da247 to
f22d1d2
Compare
Contributor
Author
|
Rebased to master, this has no dependencies now. |
Contributor
|
@leandrolanzieri this one needs rebase. |
f22d1d2 to
aeffa05
Compare
Contributor
Author
@fjmolinas Thanks, rebased |
Member
|
@miri64 @leandrolanzieri do we get last issues resolved? |
miri64
requested changes
Jan 15, 2020
Member
miri64
left a comment
There was a problem hiding this comment.
When setting CONFIG_GNRC_IPV6_EXT_FRAG_LIMIT_POOL_SIZE to 2 I can't compile anymore tests/gnrc_ipv6_ext_frag:
$ make menuconfig
Using default symbol values (no '/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/generated/merged.config')
No changes to save (for '/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/generated/merged.config')
$ make
Building application "tests_gnrc_ipv6_ext_frag" for "native" with MCU "native".
In file included from <command-line>:
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/generated/autoconf.h:72: error: "CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE" redefined [-Werror]
72 | #define CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE 2
|
<command-line>: note: this is the location of the previous definition
In file included from <command-line>:
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/riotbuild/riotbuild.h:4: error: "CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE" redefined [-Werror]
4 | #define CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE 3
|
In file included from <command-line>:
/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/generated/autoconf.h:72: note: this is the location of the previous definition
72 | #define CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE 2
|
cc1: all warnings being treated as errors
make[1]: *** [/home/mlenders/Repositories/RIOT-OS/RIOT/Makefile.base:103: /home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/application_tests_gnrc_ipv6_ext_frag/main.o] Error 1
make: *** [/home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/../../Makefile.include:540: /home/mlenders/Repositories/RIOT-OS/RIOT/tests/gnrc_ipv6_ext_frag/bin/native/application_tests_gnrc_ipv6_ext_frag.a] Error 2
Regarding the wording, I know that you mostly just copied what I wrote, but I have the feeling in isolation this has to be more precise.
Contributor
Author
I placed the Kconfig symbol check wrongly in the Makefile, now this should be fixed. |
miri64
reviewed
Jan 15, 2020
b868cc7 to
2a7b9a9
Compare
Contributor
Author
|
Rebased to current master. |
miri64
approved these changes
Jan 30, 2020
Member
|
Please squash! |
Macros that changed: GNRC_IPV6_EXT_FRAG_SEND_SIZE -> CONFIG_GNRC_IPV6_EXT_FRAG_SEND_SIZE GNRC_IPV6_EXT_FRAG_RBUF_SIZE -> CONFIG_GNRC_IPV6_EXT_FRAG_RBUF_SIZE GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE -> CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE GNRC_IPV6_EXT_FRAG_RBUF_TIMEOUT_US -> CONFIG_GNRC_IPV6_EXT_FRAG_RBUF_TIMEOUT_US
This test needs the pool size for limit objects set to 3 by default so it does not fail. As this is done with the 'app.config' file, we explicitly disable Kconfig by default.
2a7b9a9 to
6481076
Compare
Member
|
Murdock shows green light! GO |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR moves the configuration macros of
gnrc_ipv6_ext_fragto theCONFIG_namespace, and exposes them to Kconfig.In the test application a check was added, so the parameters are not changed via CFLAGS when Kconfig is being used,
that's why this depends on #12913.Testing procedure
tests/gnrc_ipv6_ext_fragshould still work as usual.make menuconfigin the test application.Issues/PRs references
Part of #12888
Depends on #12913