Skip to content
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.

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

luci-proto-ipv6: Add support for IPIP6(RFC2473) tunnel #6875

Merged
merged 1 commit into from
Mar 16, 2024
Merged

luci-proto-ipv6: Add support for IPIP6(RFC2473) tunnel #6875

merged 1 commit into from
Mar 16, 2024

Conversation

missing233
Copy link
Contributor

Add Generic Packet Tunneling in IPv6 Specification (RFC 2473) support.
(For NTT Broadband V6Plus/transix/Xpass Fixed IP)

depends on other PRs: openwrt/openwrt

@missing233 missing233 changed the title luci-proto-ipv6: add new package for IPIP6(RFC2473) support luci-proto-ipv6: add IPIP6(RFC2473) support Feb 1, 2024
@missing233 missing233 changed the title luci-proto-ipv6: add IPIP6(RFC2473) support luci-proto-ipv6: Add support for IPIP6(RFC2473) tunnel Feb 15, 2024
@systemcrash
Copy link
Contributor

OK @missing233 go ahead and resolve those conflicts and force push. When the parent PR openwrt/openwrt#14516 lands in master, go ahead and set this to ready.

@systemcrash
Copy link
Contributor

Rebase on current master to resolve conflicts

@missing233
Copy link
Contributor Author

Rebase on current master to resolve conflicts

Rebase on current master to resolve conflicts

Done.
Thanks :)

Add Generic Packet Tunneling in IPv6 Specification (RFC 2473) support.

Signed-off-by: Arayuki Mago <[email protected]>
@systemcrash
Copy link
Contributor

Rebase on current master to resolve conflicts

Rebase on current master to resolve conflicts

Done. Thanks :)

Were that so, github would not say: "This branch is out-of-date with the base branch" :)

@systemcrash
Copy link
Contributor

So you need to at least: change to master, git pull, check out ipip6, rebase, ...

@missing233 missing233 marked this pull request as ready for review March 16, 2024 12:15
@missing233
Copy link
Contributor Author

OK @missing233 go ahead and resolve those conflicts and force push. When the parent PR openwrt/openwrt#14516 lands in master, go ahead and set this to ready.

Ok it's now ready.

@systemcrash systemcrash merged commit c88e247 into openwrt:master Mar 16, 2024
5 checks passed
@systemcrash
Copy link
Contributor

OK. In she goes. Thanks @missing233

@systemcrash
Copy link
Contributor

This is in tandem with openwrt/openwrt@21eeb45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants