sixlowpan: minor fixes for non-ipv6 usage#10379
Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom Dec 18, 2018
Merged
Conversation
cgundogan
added
Type: bug
miri64
reviewed
Nov 13, 2018
| (void)context; | ||
| (void)page; | ||
| #ifdef MODULE_CCNLITE | ||
| #ifdef MODULE_CCN_LITE |
Member
There was a problem hiding this comment.
The code in here doesn't look CCN-lite related. How about
Suggested change
| #ifdef MODULE_CCN_LITE | |
| #ifndef MODULE_GNRC_IPV6 |
(or using #ifdef MODULE_GNRC_IPV6 and turn the branches around.)
| pkt = gnrc_pktbuf_remove_snip(pkt, sixlowpan); | ||
| #ifdef MODULE_CCN_LITE | ||
| payload->type = GNRC_NETTYPE_CCN; | ||
| #else /* MODULE_CCN_LITE */ |
Member
There was a problem hiding this comment.
Suggested change
| #else /* MODULE_CCN_LITE */ | |
| #elif defined(MODULE_GNRC_IPV6) |
(and then UNDEF for the else branch)
Member
|
(Compiling works) |
Member
|
Hiho, this looks easy to be moved forward and merged, right? |
Member
|
Yepp, just like to have my comments at least discussed shortly :-) |
miri64
added
the
CI: ready for build
cgundogan
force-pushed
the
pr/sixlowpan_nonipv6
branch
from
9c74951 to
79de5ae
Compare
miri64
approved these changes
Dec 18, 2018
Member
miri64
left a comment
miri64
left a comment
There was a problem hiding this comment.
Tested on iotlab-m3. I'm still able to ping between two nodes using gnrc_networking. Since ccnl-lowpan isn't integrated yet, I don't know how to test, but I trust that you did.
Member
|
And 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
4 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
When using the
sixlowpanmodule withoutIPv6, thenthe compiler stumbles across some dependencies that are not met.
Testing procedure
remove
gnrc_ipv6from theMakefile.depforgnrc_sixlowpanshould suffice. Alternatively, I completely removed thegnrc_sixlowpandependency entry fromMakefile.depand addedgnrc_sixlowpan_fragto theccn-lite-relayexample for testing purposes.Issues/PRs references
–