Skip to content

gnrc/netif/internal: fix copy-paste error#10565

Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom
haukepetersen:fix_gnrc_netifinternalvoiddefs
Dec 6, 2018
Merged

gnrc/netif/internal: fix copy-paste error#10565
miri64 merged 1 commit intoRIOT-OS:masterfrom
haukepetersen:fix_gnrc_netifinternalvoiddefs

Conversation

@haukepetersen
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen commented Dec 6, 2018

Contribution description

#10513 introduced a small error for the case that no IPv6 is compiled in: gnrc_netif_ipv6_iid_from_addr() and gnrc_netif_ipv6_iid_to_addr() are supposed to be defined to a static -ENOTSUP in that case - but there names where switched around, so that we get compile errors complaining about the wrong number of parameters...

Testing procedure

At least on my local machine, building ccn-lite-relay failed for native. With this PR it does not fail anymore... But I wonder how Murdock was able to build that example when doing the build-test for #10513...

Issues/PRs references

#10513

@haukepetersen
gnrc/netif/internal: fix copy-paste error
fe7fba7 
the names for iid_from_addr and iid_to_addr functions in the
else-block were switched around, so this fixes that
@haukepetersen haukepetersen added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: network Area: Networking CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Dec 6, 2018
@haukepetersen haukepetersen requested a review from miri64 December 6, 2018 16:22
miri64
miri64 reviewed Dec 6, 2018
View reviewed changes
Copy link
Copy Markdown
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.

Ooops, obvious ACK.

@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Dec 6, 2018

Hm, there is unfortunately more to this: when compiling the non-ipv6 case, gnrc_netif_hdr_ipv6_iid_from_src() and gnrc_netif_hdr_ipv6_iid_from_dst() further complain about unused parameters. Should we simply also put these two functions in gnrc/netif/hdr.h also inside some #ifdef MODULE_GNRC_IPV6 blocks?

@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

Don't see any other way around it. Or just (void)param; the parameters in those inline functions. The question is: what's uglier ;-)

@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

Hm, there is unfortunately more to this: when compiling the non-ipv6 case, gnrc_netif_hdr_ipv6_iid_from_src() and gnrc_netif_hdr_ipv6_iid_from_dst() further complain about unused parameters. Should we simply also put these two functions in gnrc/netif/hdr.h also inside some #ifdef MODULE_GNRC_IPV6 blocks?

Where are those functions compiled without IPv6 btw?

@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

(because IPHC should be excluded without IPv6)

@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

Maybe (if you are trying to run NDN over BLE at the moment) you need #10379?

@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

In anyway, that seems to be more of a usage problem of those functions (or this one) so I'll go ahead and merge it, as soon as Murdock agrees.

@miri64 miri64 mentioned this pull request Dec 6, 2018
Merged
@miri64
Copy link
Copy Markdown
Member

miri64 commented Dec 6, 2018

Ah ... I see... tests ^^"

@miri64 miri64 merged commit eead606 into RIOT-OS:master Dec 6, 2018
@miri64 miri64 deleted the fix_gnrc_netifinternalvoiddefs branch December 6, 2018 18:30
@aabadie aabadie added this to the Release 2019.01 milestone Dec 19, 2018
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 Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2019.01

Development

Successfully merging this pull request may close these issues.

3 participants

@haukepetersen @miri64 @aabadie