Skip to content

ipv6_netif: prepare for NDP#2909

Merged
miri64 merged 4 commits intoRIOT-OS:masterfrom
miri64:ipv6_netif/enh/opt
May 16, 2015
Merged

ipv6_netif: prepare for NDP#2909
miri64 merged 4 commits intoRIOT-OS:masterfrom
miri64:ipv6_netif/enh/opt

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented May 3, 2015

NDP needs a bigger flag space (this PR introduces some of the new flags). This also simplifies some of the usage.

@miri64 miri64 added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Process: API change Integration Process: PR contains or issue proposes an API change. Should be handled with care. NSTF labels May 3, 2015
@miri64 miri64 added this to the Network Stack Task Force milestone May 3, 2015
@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from 4494956 to 853870a Compare May 3, 2015 12:16
This was referenced May 3, 2015
Merged
Closed
OlegHahm
OlegHahm reviewed May 10, 2015
View reviewed changes
sys/include/net/ng_ipv6/netif.h Outdated
Copy link
Copy Markdown
Member

@OlegHahm OlegHahm May 10, 2015

Choose a reason for hiding this comment

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

managed by whom?

Copy link
Copy Markdown
Member Author

@miri64 miri64 May 10, 2015

Choose a reason for hiding this comment

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

By a DHCPv6 server e.g. (see https://tools.ietf.org/html/rfc4861#section-4.2)

Copy link
Copy Markdown
Member

@OlegHahm OlegHahm May 10, 2015

Choose a reason for hiding this comment

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

Can you amend this information?

Copy link
Copy Markdown
Member Author

@miri64 miri64 May 10, 2015

Choose a reason for hiding this comment

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

The plan was to reference the flag when the header was included, but since it is not here yet: sure.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 11, 2015

Addressed comments

@OlegHahm OlegHahm added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label May 11, 2015
@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 12, 2015

Is #2728 already included or do I confuse something?

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 12, 2015

It's not and this PR is independent from that.

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 12, 2015

https://github.com/RIOT-OS/RIOT/pull/2728/files#diff-db9a1a910efb231b7ee7971f29055350R65 and the following lines look very similar to the code in this PR.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 12, 2015

Mh… maybe it sneaked in here, we'll see what happens if I hit the merge button there :D

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 12, 2015

Arghs it obviously did :D will rebase.

@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from f3fb2b3 to ce9ea96 Compare May 12, 2015 17:11
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 12, 2015

Rebased

miri64
miri64 reviewed May 12, 2015
View reviewed changes
sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c
Copy link
Copy Markdown
Member Author

@miri64 miri64 May 12, 2015

Choose a reason for hiding this comment

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

Just a reminder: #2909 (comment) triggered this change.

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 13, 2015

ACK. Please squash!

@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from 62a2343 to b11a607 Compare May 13, 2015 15:32
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 13, 2015

Squashed with no merge conflicts.

@OlegHahm OlegHahm removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label May 13, 2015
@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from b11a607 to b61971b Compare May 15, 2015 15:15
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 15, 2015

There was an error in the unittests. Please check if you are happy with the current state of test_ipv6_netif_add_addr__full().

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 15, 2015

This is a superficial ACK. If @Lotterleben or @cgundogan or someone else wants to do a more careful review, please say so. Otherwise I would say that this is ready to be merged.

@miri64 miri64 assigned Lotterleben and unassigned OlegHahm May 15, 2015
@Lotterleben
Copy link
Copy Markdown
Member

Lotterleben commented May 15, 2015

@OlegHahm oof. Don't know if I could do a proper review before sunday, so... Go ahead. :)

@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from b61971b to 2e04287 Compare May 16, 2015 13:02
@miri64 miri64 force-pushed the ipv6_netif/enh/opt branch from 2e04287 to 9899153 Compare May 16, 2015 13:05
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 16, 2015

Rebased to current master

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 16, 2015

Since #2910 got ACK'd too I'd prefer to merge that one. This PR will be merged automatically too then.

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 16, 2015

Let's do this as soon as Travis is fine.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 16, 2015

But then we risk, that I might need to rebase #2910 again…

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 16, 2015

Ah, sorry, I misread: you want to merge #2910 including this one implicitly? Works for me.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 16, 2015

you want to merge #2910 including this one implicitly?

yes

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented May 16, 2015

Since #2910 got some last-minute criticism, I merge this now, since I have to squash #2910 anyway now.

miri64 added a commit that referenced this pull request May 16, 2015
@miri64
Merge pull request #2909 from authmillenon/ipv6_netif/enh/opt
ad001ab 
ipv6_netif: prepare for NDP
@miri64 miri64 merged commit ad001ab into RIOT-OS:master May 16, 2015
@miri64 miri64 deleted the ipv6_netif/enh/opt branch May 16, 2015 19:50
@miri64 miri64 added the Area: network Area: Networking label Sep 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Lotterleben Lotterleben

Labels

Area: network Area: Networking Process: API change Integration Process: PR contains or issue proposes an API change. Should be handled with care. Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

Network Stack Task Force

Development

Successfully merging this pull request may close these issues.

3 participants

@miri64 @OlegHahm @Lotterleben